Skip to content

Instantly share code, notes, and snippets.

@kacinskas
Created June 21, 2012 08:27
Show Gist options
  • Save kacinskas/2964583 to your computer and use it in GitHub Desktop.
Save kacinskas/2964583 to your computer and use it in GitHub Desktop.
gitflow flow
<!--writen in markdown syntax-->
#'gitflow' flow#
##Links##
* [HOME](https://github.com/nvie/gitflow)
* [Command-Line-Arguments](https://github.com/nvie/gitflow/wiki/Command-Line-Arguments)
* [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/)
##Init new or convert existing##
$ git flow init
...answer some questions
##Feature##
$ git flow **feature** start *FEATURENAME*
...will create new branch *FEATURENAME* from ***develop*** branch
$ git flow **feature** finish *FEATURENAME*
...will merge feature branch with *develop* branch and delete *FEATURENAME* branch
##Release##
$ git flow **release** start *VERSION*
...will create new branch *VERSION* from ***develop*** branch
$ git flow **release** finish *VERSION*
...will merge back *VERSION* branch with *develop* and *master* branch
...will mark merge with release TAG
...wil delete *VERSION* branch
##Hotfix##
$ git flow **hotfix** start *FIXNAME*
...will create new branch *FIXNAME* from ***master*** branch
$ git flow **hotfix** finish *FIXNAME*
...will merge back *FIXNAME* branch with *develop* and *master* branch
...will mark merge with release TAG
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment