Merge branch 'sp/fetch-optim'
[gitweb.git] / contrib / completion / git-completion.bash
index 49e6df09654f061d674f18ffcd6347f82ea644fa..848c067b57398154de6dc5287648b4103841217a 100755 (executable)
@@ -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