diff options
| author | Robby Russell <robby@planetargon.com> | 2012-06-13 13:14:28 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-06-13 13:14:28 -0700 |
| commit | 00c8e332a2c9cfad84069c551626be5c582d4cb0 (patch) | |
| tree | 486aeb0381c1008a4dc9bdef81d635bbb64958e3 /plugins | |
| parent | 4199c1a6f77f1605157b1cfa6baa47c14c68a6c9 (diff) | |
| parent | 33b7f22628960e5d662b14a181b3e6cc35dcaa7b (diff) | |
| download | zsh-00c8e332a2c9cfad84069c551626be5c582d4cb0.tar.gz zsh-00c8e332a2c9cfad84069c551626be5c582d4cb0.tar.bz2 zsh-00c8e332a2c9cfad84069c551626be5c582d4cb0.zip | |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git-flow/git-flow.plugin.zsh | 4 |
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' ;; |