diff options
| author | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
|---|---|---|
| committer | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
| commit | 4a11d2c35c7a526e648b37a5b02b7695be46b16a (patch) | |
| tree | 1eb542466758885ee40f3f60cc57d6438f38dc4d /plugins/git-flow/git-flow.plugin.zsh | |
| parent | e9feccf6a94f9f5238ff0b3501f62575d14ae148 (diff) | |
| parent | 11034217a7ea3cffe6e0fe631837c518b8c7e1a5 (diff) | |
| download | zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.gz zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.bz2 zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.zip | |
merge from upstream master
Diffstat (limited to 'plugins/git-flow/git-flow.plugin.zsh')
| -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' ;; |