summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-08 20:10:05 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-08 20:10:05 -0800
commitdabc42c7134596092bf59adb83c79b09f729c290 (patch)
tree0e14f06997bf7a70cbcda9b1481b8295098b5f5e /contrib
parentb59fd2098e6606e1a696fc1cafe897e074ed6d6f (diff)
parent3041c324305e2bad59d7372336940846646dd46a (diff)
downloadgit-dabc42c7134596092bf59adb83c79b09f729c290.tar.gz
Merge branch 'jc/am'
* jc/am: am: --rebasing am: remove support for -d .dotest am: read from the right mailbox when started from a subdirectory
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash10
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 49e6df0965..848c067b57 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -70,7 +70,15 @@ __git_ps1 ()
local b
if [ -d "$g/../.dotest" ]
then
- r="|AM/REBASE"
+ if test -f "$g/../.dotest/rebasing"
+ then
+ r="|REBASE"
+ elif test -f "$g/../.dotest/applying"
+ then
+ r="|AM"
+ else
+ r="|AM/REBASE"
+ fi
b="$(git symbolic-ref HEAD 2>/dev/null)"
elif [ -f "$g/.dotest-merge/interactive" ]
then