chiark / gitweb /
Call git-rerere after a failing merge as git-merge does
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 8 Mar 2009 21:15:16 +0000 (22:15 +0100)
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 8 Mar 2009 21:15:16 +0000 (22:15 +0100)
This maybe does all the hard work for you ...

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

index 37cd9cd..5b7794c 100644 (file)
@@ -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;