From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 16:34:43 +0000 (-0700)
Subject: Merge branch 'rr/prompt-revert-head'
X-Git-Tag: v1.8.3-rc0~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ab3e4c1b2db00d813b548053f3b96d57d035dd7;p=thirdparty%2Fgit.git

Merge branch 'rr/prompt-revert-head'

The prompt string generator did not notice when we are in a middle
of a "git revert" session.

* rr/prompt-revert-head:
  bash: teach __git_ps1 about REVERT_HEAD
---

5ab3e4c1b2db00d813b548053f3b96d57d035dd7