Merge branch 'jc/prompt-upstream'

An enhancement to the GIT_PS1_SHOWUPSTREAM facility. * jc/prompt-upstream: git-prompt.sh: optionally show upstream branch name

Junio C Hamano committed Oct 23, 2013 at 13:21 UTC 807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b

No changes.