diff options
| author | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
|---|---|---|
| committer | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
| commit | 29fb24487cce4e61bdc24a9a0308f04a739a3d1f (patch) | |
| tree | 7ef05913a12a6f67cd095dac9161e663035e53e2 /plugins/git-flow | |
| parent | 579f33d489c8b61e77279894cd467c3207955c09 (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.gz zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.bz2 zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.zip | |
Merge remote-tracking branch 'upstream/master'
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' ;; |