Skip to content

Commit

Permalink
Add short flag for backmerge and default to true
Browse files Browse the repository at this point in the history
Add short flag `b` for `backmerge`.
Default `backmerge` flag to true (conforms to new branching model).
Fixes nvie#49, nvie#126
  • Loading branch information
richardbuckle committed Oct 21, 2011
1 parent c111e80 commit d8fbec4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-flow-release
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ PREFIX=$(git config --get gitflow.prefix.release)
usage() {
echo "usage: git flow release [list] [-v]"
echo " git flow release start [-F] <version>"
echo " git flow release finish [-Fsumpk] <version>"
echo " git flow release finish [-Fsumpkb] <version>"
echo " git flow release publish <name>"
echo " git flow release track <name>"
}
Expand Down Expand Up @@ -193,7 +193,7 @@ cmd_finish() {
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean notag false "don't tag this release" n
DEFINE_boolean backmerge false "back-merge $MASTER_BRANCH to be a parent of $DEVELOP_BRANCH (using tag if applicable)"
DEFINE_boolean backmerge true "back-merge $MASTER_BRANCH to be a parent of $DEVELOP_BRANCH (using tag if applicable)" b

parse_args "$@"
require_version_arg
Expand Down

0 comments on commit d8fbec4

Please sign in to comment.