Squashed commit of the following + cleanup afterwards:

[dotfiles.git] / zsh / plugins / git-flow / git-flow.plugin.zsh

diff --git a/zsh/plugins/git-flow/git-flow.plugin.zsh b/zsh/plugins/git-flow/git-flow.plugin.zsh
index 4afb85b8b98523aa7ca56282607f144f7b4b56c4..ec21019e65c24ad21351dba73044952f687434e8 100644 (file)
--- a/zsh/plugins/git-flow/git-flow.plugin.zsh
+++ b/zsh/plugins/git-flow/git-flow.plugin.zsh
@@ -237,13 +237,13 @@ __git-flow-feature ()
 
                                (diff)
                                        _arguments \
 
                                (diff)
                                        _arguments \

-                                               ':branch:__git_branch_names'\
+                                               ':branch:__git_flow_feature_list'\

                                ;;
 
                                (rebase)
                                        _arguments \
                                                -i'[Do an interactive rebase]' \
                                ;;
 
                                (rebase)
                                        _arguments \
                                                -i'[Do an interactive rebase]' \

-                                               ':branch:__git_branch_names'
+                                               ':branch:__git_flow_feature_list'

                                ;;
 
                                (checkout)
                                ;;
 
                                (checkout)


@@ -254,7 +254,7 @@ __git-flow-feature ()
                                (pull)
                                        _arguments \
                                                ':remote:__git_remotes'\
                                (pull)
                                        _arguments \
                                                ':remote:__git_remotes'\

-                                               ':branch:__git_branch_names'
+                                               ':branch:__git_flow_feature_list'

                                ;;
 
                                *)
                                ;;
 
                                *)


@@ -334,4 +334,4 @@ __git_command_successful () {
        return 0
 }
 
        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'