mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 21:08:12 +02:00
Code

Merge branch 'rr/prompt-revert-head'

Browse Source 
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
commit 5ab3e4c1b2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-prompt.sh
View File

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