From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Oct 2013 20:21:45 +0000 (-0700)
Subject: Merge branch 'jc/prompt-upstream'
X-Git-Tag: v1.8.5-rc0~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b;p=thirdparty%2Fgit.git

Merge branch 'jc/prompt-upstream'

An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

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

807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b