Public Git Hosting - alt-git.git/commit

commit	807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b
author	Junio C Hamano <gitster@pobox.com>
	Wed, 23 Oct 2013 20:21:45 +0000 (23 13:21 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 23 Oct 2013 20:21:45 +0000 (23 13:21 -0700)
tree	a5dc9fe5f5fe73b37c4bb583ee63c453f1f8a26f	tree \| snapshot (tar.gz zip)
parent	f2c1b01c24b6c1df962a6526661cf3a58f3c6a56	commit \| diff
parent	1f6806cf2da84e30d162ca3aee15d16db4f1daef	commit \| diff

Merge branch 'jc/prompt-upstream'

An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

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