Changelog

• Explicitly get the default values from the system and global config.

Changelog

Peter van der Does

• When using the -d flag during init the defaults are empty

Changelog

Peter van der Does

• Bugfix: Remove inconsistency when pre_hook fails (Thanks Gabriele Pongelli)
• Fix indentation in README.md (Thanks Shoozza)

Andreas Heiduk

• Bugfix: Unexpected operator.

zheeeng

• Enhancement: Review your commits more easier on figuring out what this feature/bugfix added exactly.

Oppodelldog

• Enhancement: Allows to install a specific version of git-flow when using the gitflow-installer.sh script

mayerc

• Enhancement: Add option that will not allow the a merge back into the develop branch.

Steve Mao

• Fix: Standarize the README markdown.

Gabriele Pongelli

• Enhancement: Also use core.hooksPath for suggestion for the hook path during initialization.

Gene Pavlovsky

• Enhancement: Add .gitattributes to enforce Unix line endings for certain files.

Luca Orlandi

• Reflect shared hotfix usage in readme.

Tiscs Sun

• Enhancement: Add parameters to set names for the branches during the init command.

Silas Palmer

• Fix: Comparability change for git for windows

Pokey Rule

• Perform git push before deleting branch

Changelog

Peter van der Does

• Bugfix: Problems when using fetch.prune
• Bugfix: Errors when initializing git flow and useconfigonly is set but the name and/or email has not been set.
• Bugfix: Report summary on finish is incorrect.
• Missing push on bugfix finish
• Allow a dirty tree when starting a hotfix/support/release branch if set to do so.
  If the config gitflow.allowdirty is set to true, allow starting from a dirty tree.
• Bugfix: Error when trying to delete a non-existent remote branch
• Feature: Add rename command to bugfix/hotfix/feature

Andreas Heiduk

• git flow * rebase now supports rebase.autoStash flag
  git rebase can automatically cleanup the working tree. Therefore skip the test when and where appropriate.

Changelog

Peter van der Does

• Update github links.
• Add explanation of AVH.
• Add ability when finishing a release to push or not push the branches and/or tag involved.
• The finishing of a release branch based on a branch other than develop fails with errors.
• Add --push flag for feature finish. This gives the ability to push the base branch after the finish.
• When finishing a release have the ability to fast-forward the master branch, if possible. This is controlled by the flag --ff-master.
• Add new flag -T, --tagname to override the tag name when finishing a release or hotfix.
• Allow multiple hotfix branches by setting the config allowmultihotfix to true.
  The command to set it is

Kridsada Thanabulpong

• Fix infinite loop during Darwin link resolving.

Justin Penney

• Add detection for BusyBox getopt.