path: root/t
diff options
authorJunio C Hamano <>2006-01-29 07:15:24 (GMT)
committerJunio C Hamano <>2006-02-07 05:53:11 (GMT)
commit8389b52b2a51d5b110b508cc67f0f41f99c30d3f (patch)
tree5c0d4f548ab3e3719e64bb6087c5fbc46cf4f857 /t
parent1cb303872ab1ba73fcc52167c61fc4211c843cf5 (diff)
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 <>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions