Andrew's git / gitweb.git / diff
?
Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:14 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:14 +0000 (14:38 -0700)
* tg/maint-zsh-svn-remote-prompt:
prompt: fix show upstream with svn and zsh

1  2 
contrib/completion/git-prompt.sh patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-prompt.sh
Simple merge