summaryrefslogtreecommitdiff
path: root/plugins/git-flow
diff options
context:
space:
mode:
authorBenjamin Teuber <bsteuber@gmail.com>2012-12-06 14:09:09 +0100
committerBenjamin Teuber <bsteuber@gmail.com>2012-12-06 14:09:09 +0100
commit1b91c84d2b49f00b64e5b6048678c5d4f26cd971 (patch)
tree5639c932abfad62509cd6cb04c3ff884b2b391e1 /plugins/git-flow
parent51e05b7579a26266a0ed26398ab9eb5071800cd8 (diff)
downloadzsh-1b91c84d2b49f00b64e5b6048678c5d4f26cd971.tar.gz
zsh-1b91c84d2b49f00b64e5b6048678c5d4f26cd971.tar.bz2
zsh-1b91c84d2b49f00b64e5b6048678c5d4f26cd971.zip
use feature names instead of failing branch names in "git flow feature"
Diffstat (limited to 'plugins/git-flow')
-rw-r--r--plugins/git-flow/git-flow.plugin.zsh8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 4afb85b8b..ec21019e6 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/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' \ No newline at end of file
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'