Commit 00c8e332 authored by Robby Russell's avatar Robby Russell
Browse files

Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

parents 4199c1a6 33b7f226
...@@ -110,6 +110,8 @@ __git-flow-release () ...@@ -110,6 +110,8 @@ __git-flow-release ()
-u'[Use the given GPG-key for the digital signature (implies -s)]'\ -u'[Use the given GPG-key for the digital signature (implies -s)]'\
-m'[Use the given tag message]'\ -m'[Use the given tag message]'\
-p'[Push to $ORIGIN after performing finish]'\ -p'[Push to $ORIGIN after performing finish]'\
-k'[Keep branch after performing finish]'\
-n"[Don't tag this release]"\
':version:__git_flow_version_list' ':version:__git_flow_version_list'
;; ;;
...@@ -162,6 +164,8 @@ __git-flow-hotfix () ...@@ -162,6 +164,8 @@ __git-flow-hotfix ()
-u'[Use the given GPG-key for the digital signature (implies -s)]'\ -u'[Use the given GPG-key for the digital signature (implies -s)]'\
-m'[Use the given tag message]'\ -m'[Use the given tag message]'\
-p'[Push to $ORIGIN after performing finish]'\ -p'[Push to $ORIGIN after performing finish]'\
-k'[Keep branch after performing finish]'\
-n"[Don't tag this release]"\
':hotfix:__git_flow_hotfix_list' ':hotfix:__git_flow_hotfix_list'
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment