by Paul Verest

Disclaimer: I am not using this software, but I think it is interesting enough (as alternative git evolution) to be mentioned. Though I personally prefer 1 branch per repository (master for code, gh-pages for GitHub pages). GitHub allows treat repository just as branch and compare/merge between. Finally I decided to collect all ideas on one page.

Git makes branching incredibly easy,and merging generally very easy. So, a proliferation of branches isn't in principle a problem. The initial gitflow proposal basically provides a set of conventions on how to do development in Git.

Then this became git extentions https://github.com/nvie/gitflow , with command like below:

• To list/start/finish feature branches, use:

    git flow feature
    git flow feature start <name> [<base>]
    git flow feature finish <name>
  

  For feature branches, the <base> arg must be a commit on develop.

• To push/pull a feature branch to the remote repository, use:

    git flow feature publish <name>
      git flow feature pull <remote> <name>
  

• To list/start/finish release branches, use:

    git flow release
    git flow release start <release> [<base>]
    git flow release finish <release>
  

  For release branches, the <base> arg must be a commit on develop.

• To list/start/finish hotfix branches, use:

    git flow hotfix
    git flow hotfix start <release> [<base>]
    git flow hotfix finish <release>
  

  For hotfix branches, the <base> arg must be a commit on master.

• To list/start support branches, use:

    git flow support
    git flow support start <release> <base>
  

  For support branches, the <base> arg must be a commit on master.

If you know other ways of using git, add it as .md file at https://github.com/Nodeclipse/org.nodeclipse.gitaddon/tree/master/gitaddon.core/help