Merge branch 'rr/prompt-revert-head' into maint
* rr/prompt-revert-head: bash: teach __git_ps1 about REVERT_HEAD
This commit is contained in:
commit
ad62fd0c2c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user