adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1750 from JamesFerguson/master

Browse Source 
Make git_remote_branch plugin git-flow friendly
This commit is contained in:
Robby Russell 2013-04-23 19:42:33 -07:00
commit adb86fa83d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/git-remote-branch/git-remote-branch.plugin.zsh
View File

@ -6,7 +6,8 @@ _git_remote_branch() {
compadd create publish rename delete track compadd create publish rename delete track
elif (( CURRENT == 3 )); then elif (( CURRENT == 3 )); then
# second arg: remote branch name # 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 elif (( CURRENT == 4 )); then
# third arg: remote name # third arg: remote name
compadd `git remote` compadd `git remote`