rerere: further de-dent do_plain_rerere()

Junio C Hamano committed over 11 years ago

rerere: refactor "replay" part of do_plain_rerere()

Junio C Hamano committed over 11 years ago

rerere: explain the remainder

Junio C Hamano committed over 11 years ago

rerere: explain "rerere forget" codepath

Junio C Hamano committed over 11 years ago

rerere: explain the primary codepath

Junio C Hamano committed over 11 years ago

rerere: explain MERGE_RR management helpers

Junio C Hamano committed over 11 years ago

rerere: fix benign off-by-one non-bug and clarify code

Junio C Hamano committed about 11 years ago

rerere: explain the rerere I/O abstraction

Junio C Hamano committed over 11 years ago

rerere: do not leak mmfile[] for a path with multiple stage #1 entries

Junio C Hamano committed about 11 years ago

rerere: stop looping unnecessarily

Junio C Hamano committed over 11 years ago

rerere: drop want_sp parameter from is_cmarker()

Junio C Hamano committed over 11 years ago

rerere: report autoupdated paths only after actually updating them

Junio C Hamano committed over 11 years ago

rerere: write out each record of MERGE_RR in one go

Junio C Hamano committed over 11 years ago

rerere: lift PATH_MAX limitation

Junio C Hamano committed over 11 years ago

rerere: plug conflict ID leaks

Junio C Hamano committed over 11 years ago

rerere: handle conflicts with multiple stage #1 entries

Junio C Hamano committed about 11 years ago

RelNotes: am.threeWay does not exist (yet)

Junio C Hamano committed about 11 years ago

Revert "git-am: add am.threeWay config variable"

Junio C Hamano committed about 11 years ago

Documentation/git-worktree: fix broken 'linkgit' invocation

Eric Sunshine committed about 11 years ago

contrib/subtree: ignore log.date configuration

David Aguilar committed about 11 years ago