Skip to content

ash211/gitflow

 
 

Repository files navigation

Palantir git-flow

A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.

The palantir version of git-flow adds extra tags that can be leveraged by versioning tools.

Getting started

For the best introduction to get started with git flow, please read Jeff Kreeftmeijer's blog post:

http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

Or have a look at one of these screen casts:

Not all of these may be accurate as this version of git-flow has significant changes.

Installing git-flow

  • Clone this repo and run 'installers/gitflow_installer.sh'

Uninstalling git-flow

  • Clone this repo and run 'installers/gitflow_installer.sh uninstall'

Differences

  • git flow init does not have configurable branch names
  • git flow init has a new option '-t' that creates an empty commit on the develop branch and tags it '0.0.0-dev'
  • git flow release/hotfix start 'version' will validate that the version conforms to v?[\d]+.[\d]+.[\d]+
    • You can override this with by adding the -a flag
  • git flow release start 'version' will create an empty commit and tag it '$version-rc'
  • git flow hotfix start 'version' will create an empty commit and tag it '$version-hotfix'
  • git flow support now takes different arguments: ' ' instead of ' '
    • must match v?[\d]+.[\d]+.[\d]+
      • this can be overridden by adding the -a flag
    • must match [a-zA-Z0-9-]+
  • git flow support start will create a branch named 'support/$version-$customer'
  • git flow support start will create an empty commit and tag it '$version-support.$customer'
  • git flow release/hotfix finish 'version' will tag the merge commit to develop as '$version+1-dev'
    • If you are finishing version v1.0.0, the tag on develop will be v1.0.1-dev

About

Git extensions to provide high-level repository operations for Vincent Driessen's branching model.

Resources

License

Stars

Watchers

Forks

Packages

 
 
 

Contributors

Languages

  • Shell 100.0%