Andrew's git / gitweb.git / diff
?
Merge branch 'jc/prompt-upstream'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:21:45 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:21:45 +0000 (13:21 -0700)
An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

* jc/prompt-upstream:
git-prompt.sh: optionally show upstream branch name

Trivial merge