summaryrefslogtreecommitdiff
path: root/plugins/git-flow
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/git-flow')
-rw-r--r--plugins/git-flow/git-flow.plugin.zsh9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index ea4caa016..ec21019e6 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -221,6 +221,7 @@ __git-flow-feature ()
_arguments \
-F'[Fetch from origin before performing finish]' \
-r'[Rebase instead of merge]'\
+ -k'[Keep branch after performing finish]'\
':feature:__git_flow_feature_list'
;;
@@ -236,13 +237,13 @@ __git-flow-feature ()
(diff)
_arguments \
- ':branch:__git_branch_names'\
+ ':branch:__git_flow_feature_list'\
;;
(rebase)
_arguments \
-i'[Do an interactive rebase]' \
- ':branch:__git_branch_names'
+ ':branch:__git_flow_feature_list'
;;
(checkout)
@@ -253,7 +254,7 @@ __git-flow-feature ()
(pull)
_arguments \
':remote:__git_remotes'\
- ':branch:__git_branch_names'
+ ':branch:__git_flow_feature_list'
;;
*)
@@ -333,4 +334,4 @@ __git_command_successful () {
return 0
}
-zstyle ':completion:*:*:git:*' user-commands flow:'description for foo' \ No newline at end of file
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'