summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2021-01-25Merge branch 'en/merge-ort-3'Libravatar Junio C Hamano1-16/+430
2020-12-16merge-ort: implement merge_incore_recursive()Libravatar Elijah Newren1-2/+88
2020-12-16merge-ort: make clear_internal_opts() aware of partial clearingLibravatar Elijah Newren1-6/+7
2020-12-16merge-ort: copy a few small helper functions from merge-recursive.cLibravatar Elijah Newren1-0/+20
2020-12-15merge-ort: add implementation of type-changed rename handlingLibravatar Elijah Newren1-3/+32
2020-12-15merge-ort: add implementation of normal rename handlingLibravatar Elijah Newren1-1/+5
2020-12-15merge-ort: add implementation of rename collisionsLibravatar Elijah Newren1-3/+51
2020-12-15merge-ort: add implementation of rename/delete conflictsLibravatar Elijah Newren1-8/+40
2020-12-15merge-ort: add implementation of both sides renaming differentlyLibravatar Elijah Newren1-3/+55
2020-12-15merge-ort: add implementation of both sides renaming identicallyLibravatar Elijah Newren1-2/+18
2020-12-14merge-ort: add basic outline for process_renames()Libravatar Elijah Newren1-1/+97
2020-12-14merge-ort: implement compare_pairs() and collect_renames()Libravatar Elijah Newren1-2/+33
2020-12-14merge-ort: implement detect_regular_renames()Libravatar Elijah Newren1-1/+31
2020-12-14merge-ort: add initial outline for basic rename detectionLibravatar Elijah Newren1-8/+60
2020-12-14merge-ort: add basic data structures for handling renamesLibravatar Elijah Newren1-0/+24
2020-12-13merge-ort: add modify/delete handling and delayed output processingLibravatar Elijah Newren1-2/+98
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionLibravatar Elijah Newren1-0/+14
2020-12-13merge-ort: add function grouping commentsLibravatar Elijah Newren1-0/+21
2020-12-13merge-ort: add a paths_to_free field to merge_options_internalLibravatar Elijah Newren1-1/+25
2020-12-13merge-ort: add a path_conflict field to merge_options_internalLibravatar Elijah Newren1-0/+7
2020-12-13merge-ort: add a clear_internal_opts helperLibravatar Elijah Newren1-16/+24
2020-12-13merge-ort: add a few includesLibravatar Elijah Newren1-0/+2
2020-12-13merge-ort: free data structures in merge_finalize()Libravatar Elijah Newren1-1/+31
2020-12-13merge-ort: add implementation of record_conflicted_index_entries()Libravatar Elijah Newren1-1/+87
2020-12-13merge-ort: add implementation of checkout()Libravatar Elijah Newren1-1/+44
2020-12-13merge-ort: basic outline for merge_switch_to_result()Libravatar Elijah Newren1-1/+41
2020-12-13merge-ort: step 3 of tree writing -- handling subdirectories as we goLibravatar Elijah Newren1-8/+234
2020-12-13merge-ort: step 2 of tree writing -- function to create tree objectLibravatar Elijah Newren1-1/+66
2020-12-13merge-ort: step 1 of tree writing -- record basenames, modes, and oidsLibravatar Elijah Newren1-3/+37
2020-12-13merge-ort: have process_entries operate in a defined orderLibravatar Elijah Newren1-3/+50
2020-12-13merge-ort: add a preliminary simple process_entries() implementationLibravatar Elijah Newren1-1/+102
2020-12-13merge-ort: avoid recursing into identical treesLibravatar Elijah Newren1-0/+13
2020-12-13merge-ort: record stage and auxiliary info for every pathLibravatar Elijah Newren1-7/+90
2020-12-13merge-ort: compute a few more useful fields for collect_merge_infoLibravatar Elijah Newren1-0/+36
2020-12-13merge-ort: avoid repeating fill_tree_descriptor() on the same treeLibravatar Elijah Newren1-4/+22
2020-12-13merge-ort: implement a very basic collect_merge_info()Libravatar Elijah Newren1-1/+134
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveLibravatar Elijah Newren1-2/+29
2020-12-13merge-ort: use histogram diffLibravatar Elijah Newren1-0/+4
2020-12-13merge-ort: port merge_start() from merge-recursiveLibravatar Elijah Newren1-1/+44
2020-12-13merge-ort: add some high-level algorithm structureLibravatar Elijah Newren1-1/+67
2020-12-13merge-ort: setup basic internal data structuresLibravatar Elijah Newren1-0/+147
2020-10-26merge-ort: barebones API of new merge strategy with empty implementationLibravatar Elijah Newren1-0/+52