Merge branch 'fc/remote-bzr'

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index d2af85403d5053ad4c6dd5d5a4761e0de9eb8838..054c52e90aeabb9a9ab5d4f9ee38b0799126b338 100644 (file)
--- 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