diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-09 09:04:02 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-09 09:04:02 -0800 |
| commit | 397c085a19a22f6be515665835d09a2505cb3f23 (patch) | |
| tree | f0589e42c2aa69cc718af070f324c478d6c1e825 /plugins/git-flow/git-flow.plugin.zsh | |
| parent | bc7157ba75ad963c3fa7a3b382962ef2a1082441 (diff) | |
| parent | 1b91c84d2b49f00b64e5b6048678c5d4f26cd971 (diff) | |
| download | zsh-397c085a19a22f6be515665835d09a2505cb3f23.tar.gz zsh-397c085a19a22f6be515665835d09a2505cb3f23.tar.bz2 zsh-397c085a19a22f6be515665835d09a2505cb3f23.zip | |
Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
use feature names instead of failing branch names in "git flow feature"
Diffstat (limited to 'plugins/git-flow/git-flow.plugin.zsh')
| -rw-r--r-- | plugins/git-flow/git-flow.plugin.zsh | 8 |
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' |