summaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * merge-ort: add new data structures for directory rename detectionElijah Newren2021-01-081-3/+31
| * Merge branch 'en/merge-ort-3' into en/ort-directory-renameJunio C Hamano2021-01-081-16/+430
| |\
| | * merge-ort: add implementation of type-changed rename handlingElijah Newren2020-12-161-3/+32
| | * merge-ort: add implementation of normal rename handlingElijah Newren2020-12-161-1/+5
| | * merge-ort: add implementation of rename collisionsElijah Newren2020-12-161-3/+51
| | * merge-ort: add implementation of rename/delete conflictsElijah Newren2020-12-161-8/+40
| | * merge-ort: add implementation of both sides renaming differentlyElijah Newren2020-12-161-3/+55
| | * merge-ort: add implementation of both sides renaming identicallyElijah Newren2020-12-161-2/+18
| | * merge-ort: add basic outline for process_renames()Elijah Newren2020-12-141-1/+97
| | * merge-ort: implement compare_pairs() and collect_renames()Elijah Newren2020-12-141-2/+33
| | * merge-ort: implement detect_regular_renames()Elijah Newren2020-12-141-1/+31
| | * merge-ort: add initial outline for basic rename detectionElijah Newren2020-12-141-8/+60
| | * merge-ort: add basic data structures for handling renamesElijah Newren2020-12-141-0/+24
* | | Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfJunio C Hamano2021-01-141-18/+653
|\ \ \ | |/ / |/| |
| * | merge-ort: add handling for different types of files at same pathElijah Newren2021-01-041-4/+103
| * | merge-ort: copy find_first_merges() implementation from merge-recursive.cElijah Newren2021-01-041-1/+56
| * | merge-ort: implement format_commit()Elijah Newren2021-01-041-1/+13
| * | merge-ort: copy and adapt merge_submodule() from merge-recursive.cElijah Newren2021-01-041-1/+125
| * | merge-ort: copy and adapt merge_3way() from merge-recursive.cElijah Newren2021-01-041-1/+53
| * | merge-ort: flesh out implementation of handle_content_merge()Elijah Newren2021-01-041-6/+143
| * | merge-ort: handle book-keeping around two- and three-way content mergeElijah Newren2021-01-041-11/+41
| * | merge-ort: implement unique_path() helperElijah Newren2021-01-041-1/+24
| * | merge-ort: handle directory/file conflicts that remainElijah Newren2021-01-041-2/+84
| * | merge-ort: handle D/F conflict where directory disappears due to mergeElijah Newren2021-01-041-1/+22
| |/
* | merge-ort: implement merge_incore_recursive()Elijah Newren2020-12-171-2/+88
* | merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren2020-12-171-6/+7
* | merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren2020-12-171-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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 09:33:53 +0100