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

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

View file

@ -237,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)
@ -254,7 +254,7 @@ __git-flow-feature ()
(pull)
_arguments \
':remote:__git_remotes'\
':branch:__git_branch_names'
':branch:__git_flow_feature_list'
;;
*)
@ -334,4 +334,4 @@ __git_command_successful () {
return 0
}
zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'