diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:17 -0800 |
| commit | 2856089e367cc126f70d0a3d6d6ff5290d204f2e (patch) | |
| tree | 3f8503ef4f7315d71446aba0e8df5051554225b2 /midx.h | |
| parent | Merge branch 'ab/mktag' (diff) | |
| parent | merge-ort: add implementation of type-changed rename handling (diff) | |
| download | tgif-2856089e367cc126f70d0a3d6d6ff5290d204f2e.tar.xz | |
Merge branch 'en/merge-ort-3'
Rename detection is added to the "ORT" merge strategy.
* en/merge-ort-3:
merge-ort: add implementation of type-changed rename handling
merge-ort: add implementation of normal rename handling
merge-ort: add implementation of rename collisions
merge-ort: add implementation of rename/delete conflicts
merge-ort: add implementation of both sides renaming differently
merge-ort: add implementation of both sides renaming identically
merge-ort: add basic outline for process_renames()
merge-ort: implement compare_pairs() and collect_renames()
merge-ort: implement detect_regular_renames()
merge-ort: add initial outline for basic rename detection
merge-ort: add basic data structures for handling renames
Diffstat (limited to 'midx.h')
0 files changed, 0 insertions, 0 deletions