summaryrefslogtreecommitdiff
path: root/merge-ort.c
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: implement merge_incore_recursive()Elijah Newren2020-12-161-2/+88
* merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren2020-12-161-6/+7
* merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren2020-12-161-0/+20
* merge-ort: add modify/delete handling and delayed output processingElijah Newren2020-12-131-2/+98
* merge-ort: add die-not-implemented stub handle_content_merge() functionElijah Newren2020-12-131-0/+14
* merge-ort: add function grouping commentsElijah Newren2020-12-131-0/+21
* merge-ort: add a paths_to_free field to merge_options_internalElijah Newren2020-12-131-1/+25
* merge-ort: add a path_conflict field to merge_options_internalElijah Newren2020-12-131-0/+7
* merge-ort: add a clear_internal_opts helperElijah Newren2020-12-131-16/+24
* merge-ort: add a few includesElijah Newren2020-12-131-0/+2
* merge-ort: free data structures in merge_finalize()Elijah Newren2020-12-131-1/+31
* merge-ort: add implementation of record_conflicted_index_entries()Elijah Newren2020-12-131-1/+87
* merge-ort: add implementation of checkout()Elijah Newren2020-12-131-1/+44
* merge-ort: basic outline for merge_switch_to_result()Elijah Newren2020-12-131-1/+41
* merge-ort: step 3 of tree writing -- handling subdirectories as we goElijah Newren2020-12-131-8/+234
* merge-ort: step 2 of tree writing -- function to create tree objectElijah Newren2020-12-131-1/+66
* merge-ort: step 1 of tree writing -- record basenames, modes, and oidsElijah Newren2020-12-131-3/+37
* merge-ort: have process_entries operate in a defined orderElijah Newren2020-12-131-3/+50
* merge-ort: add a preliminary simple process_entries() implementationElijah Newren2020-12-131-1/+102
* merge-ort: avoid recursing into identical treesElijah Newren2020-12-131-0/+13
* merge-ort: record stage and auxiliary info for every pathElijah Newren2020-12-131-7/+90
* merge-ort: compute a few more useful fields for collect_merge_infoElijah Newren2020-12-131-0/+36
* merge-ort: avoid repeating fill_tree_descriptor() on the same treeElijah Newren2020-12-131-4/+22
* merge-ort: implement a very basic collect_merge_info()Elijah Newren2020-12-131-1/+134
* merge-ort: add an err() function similar to one from merge-recursiveElijah Newren2020-12-131-2/+29
* merge-ort: use histogram diffElijah Newren2020-12-131-0/+4
* merge-ort: port merge_start() from merge-recursiveElijah Newren2020-12-131-1/+44
* merge-ort: add some high-level algorithm structureElijah Newren2020-12-131-1/+67
* merge-ort: setup basic internal data structuresElijah Newren2020-12-131-0/+147
* merge-ort: barebones API of new merge strategy with empty implementationElijah Newren2020-10-261-0/+52
View Lorry Controller Status