From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Sun, 8 Mar 2009 21:15:16 +0000 (+0100)
Subject: Call git-rerere after a failing merge as git-merge does
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=d145a7b8809dda570027e3b0371fe8a2a97733af;p=topgit.git

Call git-rerere after a failing merge as git-merge does

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

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---

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;