diff options
| author | Peter Tillemans <pti@snamellit.com> | 2012-06-18 10:45:07 +0200 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2012-06-18 10:45:07 +0200 |
| commit | 8b69c7f6a0c80c1c53505e17d356387b83e18efc (patch) | |
| tree | c76fc91c12ef4f1ecc52f888a92c3472f8ae8c55 /plugins/git-flow | |
| parent | 3f42fd000c2110ec8647d341cb69a31ebbbe9b4e (diff) | |
| parent | e8d582aba98d57214a374bed01570ba791c54d9e (diff) | |
| download | zsh-8b69c7f6a0c80c1c53505e17d356387b83e18efc.tar.gz zsh-8b69c7f6a0c80c1c53505e17d356387b83e18efc.tar.bz2 zsh-8b69c7f6a0c80c1c53505e17d356387b83e18efc.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/git-flow')
| -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' ;; |