summaryrefslogtreecommitdiff
path: root/plugins/git-flow/git-flow.plugin.zsh
diff options
context:
space:
mode:
authorJames Smith <james@loopj.com>2012-07-24 13:39:07 -0700
committerJames Smith <james@loopj.com>2012-07-24 13:39:07 -0700
commit772bc51c3a2372592c400e0d4e159a0128989ba2 (patch)
tree191af002e272ce95418910b9c0ea63443e48e681 /plugins/git-flow/git-flow.plugin.zsh
parent0ba398f9e1aaf05e72406d5c840f013eebb6b260 (diff)
parentd05b2010ffd4cd33ff9402c402051b1caf985d97 (diff)
downloadzsh-772bc51c3a2372592c400e0d4e159a0128989ba2.tar.gz
zsh-772bc51c3a2372592c400e0d4e159a0128989ba2.tar.bz2
zsh-772bc51c3a2372592c400e0d4e159a0128989ba2.zip
Merge
Diffstat (limited to 'plugins/git-flow/git-flow.plugin.zsh')
-rw-r--r--plugins/git-flow/git-flow.plugin.zsh4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 270bcbe38..71b343884 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -110,6 +110,8 @@ __git-flow-release ()
-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-m'[Use the given tag message]'\
-p'[Push to $ORIGIN after performing finish]'\
+ -k'[Keep branch after performing finish]'\
+ -n"[Don't tag this release]"\
':version:__git_flow_version_list'
;;
@@ -162,6 +164,8 @@ __git-flow-hotfix ()
-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-m'[Use the given tag message]'\
-p'[Push to $ORIGIN after performing finish]'\
+ -k'[Keep branch after performing finish]'\
+ -n"[Don't tag this release]"\
':hotfix:__git_flow_hotfix_list'
;;