Merge branch 'tg/maint-zsh-svn-remote-prompt' into next
commit32a45c0aef271e0290619cce874aa10019bb1291
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:15:15 +0000 (3 13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:15:15 +0000 (3 13:15 -0700)
tree497d7d3b8fb798ea68ff6de3266c55cf170ceccb
parent01737d6e7cae11bd6ba3023d6dd7f1c3a1c12bfe
parentd0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae
Merge branch 'tg/maint-zsh-svn-remote-prompt' into next

zsh prompt script that borrowed from bash prompt script did not
work due to slight differences in array variable notation between
these two shells.

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