Here is an collection of various minor clean-ups in the implementation of one of my most favourite feature, rerere. This still hasn't reached the step to make the right refactoring to allow me to fix a bug I wanted to fix, which prompted me to look at this code, but it should give me a good starting point. Junio C Hamano (13): rerere: fix an off-by-one non-bug rerere: plug conflict ID leaks rerere: lift PATH_MAX limitation rerere: write out each record of MERGE_RR in one go rerere: report autoupdated paths only after actually updating them rerere: drop want_sp parameter from is_cmarker() rerere: stop looping unnecessarily rerere: explain the rerere I/O abstraction rerere: explain MERGE_RR management helpers rerere: explain the primary codepath rerere: explain "rerere forget" codepath rerere: explain the remainder rerere: refactor "replay" part of do_plain_rerere() rerere.c | 389 +++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 293 insertions(+), 96 deletions(-) -- 2.5.0-rc0-209-g5e1f148 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html