Skip to content

O
oh-my-zsh
Commit 397c085a authored by Robby Russell's avatar Robby Russell
Browse files
Options

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

use feature names instead of failing branch names in "git flow feature"
parents bc7157ba 1b91c84d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
plugins/git-flow/git-flow.plugin.zsh
View file @ 397c085a
...@@ -237,13 +237,13 @@ __git-flow-feature () ...@@ -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 () ...@@ -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 () { ...@@ -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'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment