Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add short flag for backmerge and default to true

Add short flag `b` for `backmerge`.
Default `backmerge` flag to true (conforms to new branching model).
Fixes #49, #126
  • Loading branch information...
commit d8fbec458c1bea25c4a1e7cb201ef2ca0dc6b341 1 parent c111e80
@richardbuckle authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 git-flow-release
View
4 git-flow-release
@@ -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>"
}
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.