search

Murmele / Gittyup

Understand your Git history!
https://murmele.github.io/Gittyup
MIT License
1.51k stars 112 forks source link

Git Flow support #490

Open 5FB5 opened 1 year ago

5FB5 commented 1 year ago

It will be very useful to have a git flow support, 'cause it's hard to develop stuff without it

RokeJulianLockhart commented 1 year ago

@5FB5, https://github.com/Murmele/Gittyup/issues/490#issue-1616687308

It will be very useful to have a git flow support, 'cause it's hard to develop stuff without it

Do you mean https://fadamakis.com/git-flow-4f4b7148d19d?

5FB5 commented 1 year ago

@5FB5, do you mean https://fadamakis.com/git-flow-4f4b7148d19d?

Yep)

RokeJulianLockhart commented 1 year ago

I don't really understand what it's about. Do you think you could concisely summarise for laymen like me, @5FB5?

5FB5 commented 1 year ago

This is a way of maintaining a repository. The basic principle is that there is a master branch, where the final working code is introduced, when developing new functions, a develop branch is created, where the code is less stable, but working, and completely unstable functions are transferred to the feature branch. There are also additional release branches for final code revision and hotfix branch for making quick fixes to the final code. So the main task is to init repository as git flow repo with already generated master (main) and develop branches with easy creating of additional branches. For example you can try git client like SmartGit or Fork (works on Win)

Fork example - https://git-fork.com/blog/page/4/ About git flow - https://nvie.com/posts/a-successful-git-branching-model/

codemedic commented 1 year ago

If we are serious about git-flow, all we need is the ability to identify the current state WRT git-flow. That can be done by looking at the branch name, usually by the prefix (feature/.., hotfix/.., release/.., etc). Once the current state is distinguished, the UI can adapt following what git-flow sub-commands offer.

silmaril42 commented 8 months ago

Just to point out what @codemedic said implicitly: Git Release Notes: v2.21.0 Comes with git-flow v1.12.3.

This means you can use commands starting with git flow with any git installation younger than five years.

Using git-flow to automate your git branching workflow gives a nice overview about the topic (if you ignore the "installing git-flow" part).

Checking the state regarding git-flow can also be done using those subcommands. Eg. git flow feature will list all existing feature branches or return "No feature branches exist."