added a -D flag to the git flow finish command to try extra hard to delete the local branch after finishing the feature
diff --git a/git-flow-feature b/git-flow-feature
index 9da4b0b..48fb74d 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -44,7 +44,7 @@
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 @@
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,7 +347,11 @@
if noflag keep; then
- git branch -d "$BRANCH"
+ if flag hard_delete; then
+ git branch -D "$BRANCH"
+ else
+ git branch -d "$BRANCH"
+ fi
fi
echo