Permalink
Browse files

add short flag for turning on nobackmerge

  • Loading branch information...
1 parent 8879745 commit 595a9928f8d70aed2e166a1e117b0b84e0b08d29 @bloveridge committed Dec 20, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 git-flow-release
View
@@ -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> [<base>]"
- 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>"
}
@@ -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 nobackmerge false "don't back-merge $MASTER_BRANCH to be a parent of $DEVELOP_BRANCH (using tag if applicable)"
+ DEFINE_boolean nobackmerge false "don't back-merge $MASTER_BRANCH to be a parent of $DEVELOP_BRANCH (using tag if applicable)" b
parse_args "$@"
require_version_arg

0 comments on commit 595a992

Please sign in to comment.