Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint
commitf79467ef364eb06ee9b49344cdec02e2bd1f2cc7
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:14 +0000 (27 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:14 +0000 (27 14:38 -0700)
tree84f2432aeb0d6c4fc78f2ecb1be1933db7c062de
parentfc78791b7c2cb17a461e7881ee4585b3eafda4b6
parentd0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae
Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint

* tg/maint-zsh-svn-remote-prompt:
  prompt: fix show upstream with svn and zsh
contrib/completion/git-prompt.sh