diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:05 -0700 |
| commit | dc5400e11d4cbd41336a8b7b64f69b4e486ed049 (patch) | |
| tree | ef58eb77100c6e299608eaaa42d0b396226e8c78 /read-cache.c | |
| parent | Merge branch 'kn/for-each-tag-branch' (diff) | |
| parent | rerere: un-nest merge() further (diff) | |
| download | tgif-dc5400e11d4cbd41336a8b7b64f69b4e486ed049.tar.xz | |
Merge branch 'jc/rerere'
Code clean-up and minor fixes.
* jc/rerere: (21 commits)
rerere: un-nest merge() further
rerere: use "struct rerere_id" instead of "char *" for conflict ID
rerere: call conflict-ids IDs
rerere: further clarify do_rerere_one_path()
rerere: further de-dent do_plain_rerere()
rerere: refactor "replay" part of do_plain_rerere()
rerere: explain the remainder
rerere: explain "rerere forget" codepath
rerere: explain the primary codepath
rerere: explain MERGE_RR management helpers
rerere: fix benign off-by-one non-bug and clarify code
rerere: explain the rerere I/O abstraction
rerere: do not leak mmfile[] for a path with multiple stage #1 entries
rerere: stop looping unnecessarily
rerere: drop want_sp parameter from is_cmarker()
rerere: report autoupdated paths only after actually updating them
rerere: write out each record of MERGE_RR in one go
rerere: lift PATH_MAX limitation
rerere: plug conflict ID leaks
rerere: handle conflicts with multiple stage #1 entries
...
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions