diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:54 -0700 |
| commit | ad62fd0c2c00aa0cf991d6060cbb13bdd7727319 (patch) | |
| tree | bb20c623a5070adfee086fa584d7290d2c23a07a /contrib | |
| parent | remote-hg: fix commit messages (diff) | |
| parent | bash: teach __git_ps1 about REVERT_HEAD (diff) | |
| download | tgif-ad62fd0c2c00aa0cf991d6060cbb13bdd7727319.tar.xz | |
Merge branch 'rr/prompt-revert-head' into maint
* rr/prompt-revert-head:
bash: teach __git_ps1 about REVERT_HEAD
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 341422a766..756a951459 100644 --- 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 |