diff options
Diffstat (limited to 'third_party/git/contrib/completion/git-prompt.sh')
| -rw-r--r-- | third_party/git/contrib/completion/git-prompt.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/third_party/git/contrib/completion/git-prompt.sh b/third_party/git/contrib/completion/git-prompt.sh index 014cd7c3cfcc..1d510cd47bef 100644 --- a/third_party/git/contrib/completion/git-prompt.sh +++ b/third_party/git/contrib/completion/git-prompt.sh @@ -429,7 +429,11 @@ __git_ps1 () __git_eread "$g/rebase-merge/head-name" b __git_eread "$g/rebase-merge/msgnum" step __git_eread "$g/rebase-merge/end" total - r="|REBASE" + if [ -f "$g/rebase-merge/interactive" ]; then + r="|REBASE-i" + else + r="|REBASE-m" + fi else if [ -d "$g/rebase-apply" ]; then __git_eread "$g/rebase-apply/next" step |