Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diff
1diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
2index 270bcbe389b79224d4725e45be39abb4c3823829..71b343884a5428660c92ce86ca63823d4337f8c7 100644
3--- a/plugins/git-flow/git-flow.plugin.zsh
4+++ b/plugins/git-flow/git-flow.plugin.zsh
5@@ -110,6 +110,8 @@ __git-flow-release ()
6 -u'[Use the given GPG-key for the digital signature (implies -s)]'\
7 -m'[Use the given tag message]'\
8 -p'[Push to $ORIGIN after performing finish]'\
9+ -k'[Keep branch after performing finish]'\
10+ -n"[Don't tag this release]"\
11 ':version:__git_flow_version_list'
12 ;;
1314@@ -162,6 +164,8 @@ __git-flow-hotfix ()
15 -u'[Use the given GPG-key for the digital signature (implies -s)]'\
16 -m'[Use the given tag message]'\
17 -p'[Push to $ORIGIN after performing finish]'\
18+ -k'[Keep branch after performing finish]'\
19+ -n"[Don't tag this release]"\
20 ':hotfix:__git_flow_hotfix_list'
21 ;;
22