Merge branch 'rr/prompt-revert-head' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:54 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:54 +0000 (11:26 -0700)
* rr/prompt-revert-head:
bash: teach __git_ps1 about REVERT_HEAD

Trivial merge