mirror of
https://github.com/git/git.git
synced 2024-10-20 01:48:55 +02:00
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:
commit
5ab3e4c1b2
@ -282,6 +282,8 @@ __git_ps1 ()
|
|||||||
r="|MERGING"
|
r="|MERGING"
|
||||||
elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
|
elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
|
||||||
r="|CHERRY-PICKING"
|
r="|CHERRY-PICKING"
|
||||||
|
elif [ -f "$g/REVERT_HEAD" ]; then
|
||||||
|
r="|REVERTING"
|
||||||
elif [ -f "$g/BISECT_LOG" ]; then
|
elif [ -f "$g/BISECT_LOG" ]; then
|
||||||
r="|BISECTING"
|
r="|BISECTING"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user