diff options
author | Robby Russell <robby@planetargon.com> | 2012-12-02 11:50:36 -0800 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2012-12-02 11:50:36 -0800 |
commit | 56f094860bec91c1968d46cccd5d2c2e3d179de1 (patch) | |
tree | 88038f3e9a42d40906ce77252d4e664a1eb60fb8 /plugins/git-flow | |
parent | ded745bf1471487c7dc537c781685615ff4c2515 (diff) | |
parent | 80ab595696f30d89bf52bb5189fa39518a3ca780 (diff) | |
download | zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.tar.gz zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.tar.bz2 zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.zip |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/git-flow')
-rw-r--r-- | plugins/git-flow/git-flow.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh index 71b343884..ea4caa016 100644 --- a/plugins/git-flow/git-flow.plugin.zsh +++ b/plugins/git-flow/git-flow.plugin.zsh @@ -195,7 +195,7 @@ __git-flow-feature () 'start:Start a new feature branch.' 'finish:Finish a feature branch.' 'list:List all your feature branches. (Alias to `git flow feature`)' - 'publish: public' + 'publish: publish' 'track: track' 'diff: diff' 'rebase: rebase' |