From 8389b52b2a51d5b110b508cc67f0f41f99c30d3f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 28 Jan 2006 23:15:24 -0800 Subject: git-rerere: reuse recorded resolve. In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream). This commit introduces a new command, "git rerere", to help this process by recording the conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same conflicted automerge and applying the previously recorded hand resolution using three-way merge. Signed-off-by: Junio C Hamano --- git-am.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-am.sh') diff --git a/git-am.sh b/git-am.sh index 731ab1fffa..ee6886f300 100755 --- a/git-am.sh +++ b/git-am.sh @@ -88,6 +88,7 @@ fall_back_3way () { # saying that we reverted all those changes. git-merge-resolve $orig_tree -- HEAD $his_tree || { + git-rerere echo Failed to merge in the changes. exit 1 } -- cgit v1.2.3