]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tg/maint-zsh-svn-remote-prompt'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:41 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:41 +0000 (14:56 -0700)
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

1  2 
contrib/completion/git-prompt.sh

Simple merge