summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2021-02-16merge-ort: call diffcore_rename() directlyElijah Newren
2021-01-24merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren
2021-01-24merge-ort: ignore the directory rename split conflict for nowElijah Newren
2021-01-24merge-ort: fix massive leakElijah Newren
2021-01-21Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano
2021-01-21merge-ort: fix a directory rename detection bugElijah Newren
2021-01-21merge-ort: process_renames() now needs more defensivenessElijah Newren
2021-01-21merge-ort: implement apply_directory_rename_modifications()Elijah Newren
2021-01-21merge-ort: add a new toplevel_dir fieldElijah Newren
2021-01-21merge-ort: implement handle_path_level_conflicts()Elijah Newren
2021-01-21merge-ort: implement check_for_directory_rename()Elijah Newren
2021-01-21merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren
2021-01-21merge-ort: implement compute_collisions()Elijah Newren
2021-01-21merge-ort: modify collect_renames() for directory rename handlingElijah Newren
2021-01-21merge-ort: implement handle_directory_level_conflicts()Elijah Newren
2021-01-21merge-ort: implement compute_rename_counts()Elijah Newren
2021-01-21merge-ort: copy get_renamed_dir_portion() from merge-recursive.cElijah Newren
2021-01-21merge-ort: add outline of get_provisional_directory_renames()Elijah Newren
2021-01-21merge-ort: add outline for computing directory renamesElijah Newren
2021-01-14Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfJunio C Hamano
2021-01-07merge-ort: collect which directories are removed in dirs_removedElijah Newren
2021-01-07merge-ort: initialize and free new directory rename data structuresElijah Newren
2021-01-07merge-ort: add new data structures for directory rename detectionElijah Newren
2021-01-07Merge branch 'en/merge-ort-3' into en/ort-directory-renameJunio C Hamano
2021-01-04merge-ort: add handling for different types of files at same pathElijah Newren
2021-01-04merge-ort: copy find_first_merges() implementation from merge-recursive.cElijah Newren
2021-01-04merge-ort: implement format_commit()Elijah Newren
2021-01-04merge-ort: copy and adapt merge_submodule() from merge-recursive.cElijah Newren
2021-01-04merge-ort: copy and adapt merge_3way() from merge-recursive.cElijah Newren
2021-01-04merge-ort: flesh out implementation of handle_content_merge()Elijah Newren
2021-01-04merge-ort: handle book-keeping around two- and three-way content mergeElijah Newren
2021-01-04merge-ort: implement unique_path() helperElijah Newren
2021-01-04merge-ort: handle directory/file conflicts that remainElijah Newren
2021-01-04merge-ort: handle D/F conflict where directory disappears due to mergeElijah Newren
2020-12-17merge-ort: implement merge_incore_recursive()Elijah Newren
2020-12-17merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren
2020-12-17merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren
2020-12-16merge-ort: add implementation of type-changed rename handlingElijah Newren
2020-12-16merge-ort: add implementation of normal rename handlingElijah Newren
2020-12-16merge-ort: add implementation of rename collisionsElijah Newren
2020-12-16merge-ort: add implementation of rename/delete conflictsElijah Newren
2020-12-16merge-ort: add implementation of both sides renaming differentlyElijah Newren
2020-12-16merge-ort: add implementation of both sides renaming identicallyElijah Newren
2020-12-14merge-ort: add basic outline for process_renames()Elijah Newren
2020-12-14merge-ort: implement compare_pairs() and collect_renames()Elijah Newren
2020-12-14merge-ort: implement detect_regular_renames()Elijah Newren
2020-12-14merge-ort: add initial outline for basic rename detectionElijah Newren
2020-12-14merge-ort: add basic data structures for handling renamesElijah Newren
2020-12-13merge-ort: add modify/delete handling and delayed output processingElijah Newren
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionElijah Newren