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
git-mirror · Apr 3, 2013 · 5ab3e4c · 5ab3e4c
2 parents 8054b9a + 3ee4452
commit 5ab3e4c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -282,6 +282,8 @@ __git_ps1 ()
 				r="|MERGING"
 			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
 				r="|CHERRY-PICKING"
+			elif [ -f "$g/REVERT_HEAD" ]; then
+				r="|REVERTING"
 			elif [ -f "$g/BISECT_LOG" ]; then
 				r="|BISECTING"
 			fi