summaryrefslogtreecommitdiff
path: root/plugins/git-flow
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-12-02 12:39:41 -0800
committerRobby Russell <robby@planetargon.com>2012-12-02 12:39:41 -0800
commit215d6da3dedd44d8ec23ccb34b54f14d9f96428f (patch)
treeb437134fa992814e5eba5e013b9af4348315167f /plugins/git-flow
parent44edb3ed607389525edae4c2c0160747b05b56bf (diff)
parentf995218d081ac66b86d40a0141db5d445147b50d (diff)
downloadzsh-215d6da3dedd44d8ec23ccb34b54f14d9f96428f.tar.gz
zsh-215d6da3dedd44d8ec23ccb34b54f14d9f96428f.tar.bz2
zsh-215d6da3dedd44d8ec23ccb34b54f14d9f96428f.zip
Merge pull request #1277 from waveface/master
git flow completion enhancement
Diffstat (limited to 'plugins/git-flow')
-rw-r--r--plugins/git-flow/git-flow.plugin.zsh1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index ea4caa016..4afb85b8b 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'
;;