diff options
| author | Stephen Zhuang <stephen.zhuang@gmail.com> | 2013-01-06 14:10:42 +0800 |
|---|---|---|
| committer | Stephen Zhuang <stephen.zhuang@gmail.com> | 2013-01-06 14:10:42 +0800 |
| commit | 914c47b3473b000288c693523f83fde998282a81 (patch) | |
| tree | a29cf3d796544a3b2807e26812011cda51f644a9 /plugins/git-flow/git-flow.plugin.zsh | |
| parent | 692dca07158413ae27b2064c303240f5b9621cff (diff) | |
| parent | 80a603259657acab97badbae20003b5a34c901f9 (diff) | |
| download | zsh-914c47b3473b000288c693523f83fde998282a81.tar.gz zsh-914c47b3473b000288c693523f83fde998282a81.tar.bz2 zsh-914c47b3473b000288c693523f83fde998282a81.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/git-flow/git-flow.plugin.zsh')
| -rw-r--r-- | plugins/git-flow/git-flow.plugin.zsh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh index 71b343884..ec21019e6 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' @@ -221,6 +221,7 @@ __git-flow-feature () _arguments \ -F'[Fetch from origin before performing finish]' \ -r'[Rebase instead of merge]'\ + -k'[Keep branch after performing finish]'\ ':feature:__git_flow_feature_list' ;; @@ -236,13 +237,13 @@ __git-flow-feature () (diff) _arguments \ - ':branch:__git_branch_names'\ + ':branch:__git_flow_feature_list'\ ;; (rebase) _arguments \ -i'[Do an interactive rebase]' \ - ':branch:__git_branch_names' + ':branch:__git_flow_feature_list' ;; (checkout) @@ -253,7 +254,7 @@ __git-flow-feature () (pull) _arguments \ ':remote:__git_remotes'\ - ':branch:__git_branch_names' + ':branch:__git_flow_feature_list' ;; *) @@ -333,4 +334,4 @@ __git_command_successful () { return 0 } -zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
\ No newline at end of file +zstyle ':completion:*:*:git:*' user-commands flow:'description for foo' |