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 37cd9cdd11f1a230a7d4c2ac08e1bc920afae160..5b7794c2470e0b5badbcbd1af55f5c6eb347ae9f 100644 (file)
--- 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;