git-rerere: reuse recorded resolve.
authorJunio C Hamano <junkio@cox.net>
Sun, 29 Jan 2006 07:15:24 +0000 (23:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 7 Feb 2006 05:53:11 +0000 (21:53 -0800)
commit8389b52b2a51d5b110b508cc67f0f41f99c30d3f
tree5c0d4f548ab3e3719e64bb6087c5fbc46cf4f857
parent1cb303872ab1ba73fcc52167c61fc4211c843cf5
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>
Documentation/git-rerere.txt [new file with mode: 0644]
Documentation/git.txt
Makefile
git-am.sh
git-commit.sh
git-merge.sh
git-rerere.perl [new file with mode: 0755]
git-reset.sh