summaryrefslogtreecommitdiff
path: root/plugins/git-flow
diff options
context:
space:
mode:
authorSébastien M-B <essembeh@gmail.com>2012-06-27 00:12:55 +0200
committerSébastien M-B <essembeh@gmail.com>2012-06-27 00:12:55 +0200
commit8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (patch)
treeb521e91a17b715259ed31ffa163f9254f8b546a8 /plugins/git-flow
parent18cb11903f8208403a0ba5a8f2ece1a0bd4ef9a3 (diff)
parent29fb24487cce4e61bdc24a9a0308f04a739a3d1f (diff)
downloadzsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.tar.gz
zsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.tar.bz2
zsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.zip
Merge branch 'master' of github.com:essembeh/oh-my-zsh
Diffstat (limited to 'plugins/git-flow')
-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'
;;