summaryrefslogtreecommitdiff
path: root/merge-ort.c
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: call diffcore_rename() directlyElijah Newren2021-02-151-7/+59
* merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren2021-01-231-0/+57
* merge-ort: ignore the directory rename split conflict for nowElijah Newren2021-01-231-1/+12
* merge-ort: fix massive leakElijah Newren2021-01-231-0/+17
* Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano2021-01-201-22/+1228
|\
| * merge-ort: fix a directory rename detection bugElijah Newren2021-01-201-117/+81
| * merge-ort: process_renames() now needs more defensivenessElijah Newren2021-01-201-5/+21
| * merge-ort: implement apply_directory_rename_modifications()Elijah Newren2021-01-201-1/+167
| * merge-ort: add a new toplevel_dir fieldElijah Newren2021-01-201-6/+9
| * merge-ort: implement handle_path_level_conflicts()Elijah Newren2021-01-201-1/+71
| * merge-ort: implement check_for_directory_rename()Elijah Newren2021-01-201-1/+66
| * merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren2021-01-201-2/+35
| * merge-ort: implement compute_collisions()Elijah Newren2021-01-201-1/+67
| * merge-ort: modify collect_renames() for directory rename handlingElijah Newren2021-01-201-4/+74
| * merge-ort: implement handle_directory_level_conflicts()Elijah Newren2021-01-201-1/+18
| * merge-ort: implement compute_rename_counts()Elijah Newren2021-01-201-2/+52
| * merge-ort: copy get_renamed_dir_portion() from merge-recursive.cElijah Newren2021-01-201-0/+104
| * merge-ort: add outline of get_provisional_directory_renames()Elijah Newren2021-01-201-1/+56
| * merge-ort: add outline for computing directory renamesElijah Newren2021-01-201-1/+24
| * merge-ort: collect which directories are removed in dirs_removedElijah Newren2021-01-071-0/+27
| * merge-ort: initialize and free new directory rename data structuresElijah Newren2021-01-071-0/+35
| * merge-ort: add new data structures for directory rename detectionElijah Newren2021-01-071-3/+31
| * Merge branch 'en/merge-ort-3' into en/ort-directory-renameJunio C Hamano2021-01-071-16/+430
| |\
| | * merge-ort: add implementation of type-changed rename handlingElijah Newren2020-12-151-3/+32
| | * merge-ort: add implementation of normal rename handlingElijah Newren2020-12-151-1/+5
| | * merge-ort: add implementation of rename collisionsElijah Newren2020-12-151-3/+51
| | * merge-ort: add implementation of rename/delete conflictsElijah Newren2020-12-151-8/+40
| | * merge-ort: add implementation of both sides renaming differentlyElijah Newren2020-12-151-3/+55
| | * merge-ort: add implementation of both sides renaming identicallyElijah Newren2020-12-151-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-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
View Lorry Controller Status