diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:17:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:17:15 -0700 |
| commit | 5b715ec48fe616b443abd87ff038c94c64fc1063 (patch) | |
| tree | 763b764fce8ea6132ab117daaf5400799b2106c2 /builtin/fsck.c | |
| parent | Sixth batch for post 2.8 cycle (diff) | |
| parent | rerere: adjust 'forget' to multi-variant world order (diff) | |
| download | tgif-5b715ec48fe616b443abd87ff038c94c64fc1063.tar.xz | |
Merge branch 'jc/rerere-multi'
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
* jc/rerere-multi:
rerere: adjust 'forget' to multi-variant world order
rerere: split code to call ll_merge() further
rerere: move code related to "forget" together
rerere: gc and clear
rerere: do use multiple variants
t4200: rerere a merge with two identical conflicts
rerere: allow multiple variants to exist
rerere: delay the recording of preimage
rerere: handle leftover rr-cache/$ID directory and postimage files
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
rerere: split conflict ID further
Diffstat (limited to 'builtin/fsck.c')
0 files changed, 0 insertions, 0 deletions