adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion

Browse Source 
use feature names instead of failing branch names in "git flow feature"
This commit is contained in:
Robby Russell 2012-12-09 09:04:02 -08:00
commit 397c085a19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/git-flow/git-flow.plugin.zsh
View File

@ -237,13 +237,13 @@ __git-flow-feature ()
(diff) (diff)
_arguments \ _arguments \
':branch:__git_branch_names'\ ':branch:__git_flow_feature_list'\
;; ;;
(rebase) (rebase)
_arguments \ _arguments \
-i'[Do an interactive rebase]' \ -i'[Do an interactive rebase]' \
':branch:__git_branch_names' ':branch:__git_flow_feature_list'
;; ;;
(checkout) (checkout)
@ -254,7 +254,7 @@ __git-flow-feature ()
(pull) (pull)
_arguments \ _arguments \
':remote:__git_remotes'\ ':remote:__git_remotes'\
':branch:__git_branch_names' ':branch:__git_flow_feature_list'
;; ;;
*) *)
@ -334,4 +334,4 @@ __git_command_successful () {
return 0 return 0
} }
zstyle ':completion:*:*:git:*' user-commands flow:'description for foo' zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'