Merge branch 'rr/prompt-revert-head'
commit5ab3e4c1b2db00d813b548053f3b96d57d035dd7
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:43 +0000 (3 09:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:43 +0000 (3 09:34 -0700)
treec06f3f08ad60f4423c3075f6801074bdbcf975b7
parent8054b9a6153dffca012efe609ffa18004e8251e5
parent3ee4452837a1f99088517b25938d5c85aac4a583
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