X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hb=810255fd12536d296597a0366f514bf65c2e10f6;hp=1a114bcc0809836ed4edaa0866704b899e587cd2;hpb=e0e3ba208d235ab5623a86204fbd20b449520764;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 1a114bcc..98b9215f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -88,6 +88,10 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
+	    if test -d "$GIT_DIR/rr-cache"
+	    then
+		git-rerere
+	    fi
 	    echo Failed to merge in the changes.
 	    exit 1
     }
@@ -211,6 +215,7 @@ this=`cat "$dotest/next"`
 if test "$skip" = t
 then
 	this=`expr "$this" + 1`
+	resume=
 fi
 
 if test "$this" -gt "$last"
@@ -225,6 +230,7 @@ do
 	msgnum=`printf "%0${prec}d" $this`
 	next=`expr "$this" + 1`
 	test -f "$dotest/$msgnum" || {
+		resume=
 		go_next
 		continue
 	}