Commit 9c5c806c authored by Chad Walker's avatar Chad Walker

added a -D flag to the git flow finish command to try extra hard to delete the...

added a -D flag to the git flow finish command to try extra hard to delete the local branch after finishing the feature
parent be5dabf8
......@@ -44,7 +44,7 @@ PREFIX=$(git config --get gitflow.prefix.feature)
usage() {
echo "usage: git flow feature [list] [-v]"
echo " git flow feature start [-F] <name> [<base>]"
echo " git flow feature finish [-rFk] [<name|nameprefix>]"
echo " git flow feature finish [-rFkD] [<name|nameprefix>]"
echo " git flow feature publish <name>"
echo " git flow feature track <name>"
echo " git flow feature diff [<name|nameprefix>]"
......@@ -231,6 +231,7 @@ cmd_finish() {
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
DEFINE_boolean rebase false "rebase instead of merge" r
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
parse_args "$@"
expand_nameprefix_arg_or_current
......@@ -346,8 +347,12 @@ helper_finish_cleanup() {
if noflag keep; then
if flag hard_delete; then
git branch -D "$BRANCH"
else
git branch -d "$BRANCH"
fi
fi
echo
echo "Summary of actions:"
......
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