summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-06-13 13:11:36 -0700
committerRobby Russell <robby@planetargon.com>2012-06-13 13:11:36 -0700
commit33b7f22628960e5d662b14a181b3e6cc35dcaa7b (patch)
treeac0020889e1e474198b4f1bbc53810687dbd5d38 /plugins
parente6c81a58939c8aa1ff8dcf583c3c8b5d129f8aab (diff)
parentdf30eae4121802f8ac800cb3e92c7d08356217a6 (diff)
downloadzsh-33b7f22628960e5d662b14a181b3e6cc35dcaa7b.tar.gz
zsh-33b7f22628960e5d662b14a181b3e6cc35dcaa7b.tar.bz2
zsh-33b7f22628960e5d662b14a181b3e6cc35dcaa7b.zip
Merge pull request #1148 from erichmenge/git-flow-plugin
Add a couple of options for git-flow.
Diffstat (limited to 'plugins')
-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'
;;