diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:43 -0700 |
| commit | 5ab3e4c1b2db00d813b548053f3b96d57d035dd7 (patch) | |
| tree | c06f3f08ad60f4423c3075f6801074bdbcf975b7 /contrib | |
| parent | Merge branch 'jm/branch-rename-nothing-error' (diff) | |
| parent | bash: teach __git_ps1 about REVERT_HEAD (diff) | |
| download | tgif-5ab3e4c1b2db00d813b548053f3b96d57d035dd7.tar.xz | |
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
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 |