diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-07 15:29:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-07 15:29:49 -0800 |
| commit | 8f894b22636d5d0cdfca0ae5fd88d327cc3349b3 (patch) | |
| tree | 4e572bd0a0be8fb1342ca3a8c5091aa1f44a7556 /commit.h | |
| parent | 72c4083ddf91b489b7b7b812df67ee8842177d98 (diff) | |
| parent | 6fcccbd75556d1dcc80493f6eb51109f53a5dc83 (diff) | |
Merge branch 'en/merge-ort-3' into en/ort-directory-rename
* 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 'commit.h')
0 files changed, 0 insertions, 0 deletions