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
This commit is contained in:
Junio C Hamano 2013-04-03 09:34:43 -07:00
Родитель 8054b9a615 3ee4452837
Коммит 5ab3e4c1b2
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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