Permalink
Browse files

Merge pull request #1750 from JamesFerguson/master

Make git_remote_branch plugin git-flow friendly
  • Loading branch information...
2 parents 93ee939 + d4d8939 commit adb86fa83d7eba9b6033798395da713f5129ee06 @robbyrussell committed Apr 24, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 plugins/git-remote-branch/git-remote-branch.plugin.zsh
@@ -6,7 +6,8 @@ _git_remote_branch() {
compadd create publish rename delete track
elif (( CURRENT == 3 )); then
# second arg: remote branch name
- compadd `git branch -r | grep -v HEAD | sed "s/.*\///" | sed "s/ //g"`
+ remotes=`git remote | tr '\n' '|' | sed "s/\|$//g"`
+ compadd `git branch -r | grep -v HEAD | sed "s/$remotes\///" | sed "s/ //g"`
elif (( CURRENT == 4 )); then
# third arg: remote name
compadd `git remote`

0 comments on commit adb86fa

Please sign in to comment.