From d145a7b8809dda570027e3b0371fe8a2a97733af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Sun, 8 Mar 2009 22:15:16 +0100
Subject: [PATCH] Call git-rerere after a failing merge as git-merge does
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This maybe does all the hard work for you ...

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 tg-export.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tg-export.sh b/tg-export.sh
index 37cd9cd..5b7794c 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -231,6 +231,7 @@ linearize()
 		git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
 
 		if test "x$retmerge" != "x0"; then
+			git rerere;
 			echo "fix up the merge and update the index.  Don't commit!"
 			#todo error handling
 			sh -i </dev/tty;
-- 
2.11.4.GIT