Skip to content

G
gitflow
Commit 4895c15e authored by Vincent Driessen's avatar Vincent Driessen
Browse files
Options

Fix wording.

parent 9c5c806c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
git-flow-feature
View file @ 4895c15e
...@@ -231,7 +231,7 @@ cmd_finish() { ...@@ -231,7 +231,7 @@ cmd_finish() {
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
DEFINE_boolean rebase false "rebase instead of merge" r DEFINE_boolean rebase false "rebase instead of merge" r
DEFINE_boolean keep false "keep branch after performing finish" k DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean hard_delete false "try extra hard to delete the branch after performing finish" D DEFINE_boolean force_delete false "force delete feature branch after finish" D
parse_args "$@" parse_args "$@"
expand_nameprefix_arg_or_current expand_nameprefix_arg_or_current
...@@ -347,7 +347,7 @@ helper_finish_cleanup() { ...@@ -347,7 +347,7 @@ helper_finish_cleanup() {
if noflag keep; then if noflag keep; then
if flag hard_delete; then if flag force_delete; then
git branch -D "$BRANCH" git branch -D "$BRANCH"
else else
git branch -d "$BRANCH" git branch -d "$BRANCH"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment