Permalink
Browse files

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

use feature names instead of failing branch names in "git flow feature"
  • Loading branch information...
2 parents bc7157b + 1b91c84 commit 397c085a19a22f6be515665835d09a2505cb3f23 @robbyrussell committed Dec 9, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 plugins/git-flow/git-flow.plugin.zsh
View
8 plugins/git-flow/git-flow.plugin.zsh
@@ -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'

0 comments on commit 397c085

Please sign in to comment.