summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-28 23:15:24 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-06 21:53:11 -0800
commit8389b52b2a51d5b110b508cc67f0f41f99c30d3f (patch)
tree5c0d4f548ab3e3719e64bb6087c5fbc46cf4f857 /git-merge.sh
parent1cb303872ab1ba73fcc52167c61fc4211c843cf5 (diff)
downloadgit-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.tar.gz
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 <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c147..dc17baf6e0 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -309,5 +309,6 @@ Conflicts:
sed -e 's/^[^ ]* / /' |
uniq
} >>"$GIT_DIR/MERGE_MSG"
+ git rerere
die "Automatic merge failed; fix up by hand"
fi