Merge branch 'rr/prompt-revert-head' into maint
commitad62fd0c2c00aa0cf991d6060cbb13bdd7727319
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:54 +0000 (22 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:54 +0000 (22 11:26 -0700)
treebb20c623a5070adfee086fa584d7290d2c23a07a
parent845241d5446c6c4be70fcaa9f7b605e7c6760181
parent3ee4452837a1f99088517b25938d5c85aac4a583
Merge branch 'rr/prompt-revert-head' into maint

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