From f1bb292121ea13f38886d54c21f6de0f506a4a90 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sat, 3 Oct 2015 13:05:25 -0700 Subject: [PATCH] tg-export.sh: call rerere again after shell exit Since d145a7b8 (Call git-rerere after a failing merge as git-merge does, topgit-0.8), we've been calling git rerere when we have a failed merge and are about to spawn a shell for the user to fix it up. However, we did not then call git rerere again after shell exit to record the resolution. Fix that and call git rerere a second time after the user has fixed the problem and exited the spawned shell so the merge resolution will be recorded for future use. Signed-off-by: Kyle J. McKay --- tg-export.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tg-export.sh b/tg-export.sh index ca5ed66..d91f3cb 100644 --- a/tg-export.sh +++ b/tg-export.sh @@ -298,6 +298,7 @@ linearize() echo "fix up the merge, update the index and then exit. Don't commit!" #todo error handling "${SHELL:-/bin/sh}" -i