From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 08 Dec 2006 10:49:29 GMT
Subject: [PATCH 4/5] am: run git rerere to record resolution on successful --resolved
Message-ID: <11655749761154-git-send-email-normalperson@yhbt.net>
In-Reply-To: <20061205092126.GE27236@soma>

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 git-am.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 179b967..d0714c6 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -414,6 +414,10 @@ do
 			stop_here_user_resolve $this
 		fi
 		apply_status=0
+		if test -d "$GIT_DIR/rr-cache"
+		then
+			git rerere
+		fi
 		;;
 	esac
 
-- 
1.4.4.2.g860f4