summaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren2021-03-201-12/+1
* merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-201-0/+10
* merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren2021-03-201-13/+30
* merge-ort: support subtree shiftingElijah Newren2021-03-201-0/+24
* merge-ort: let renormalization change modify/delete into clean deleteElijah Newren2021-03-201-2/+62
* merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren2021-03-201-2/+62
* merge-ort: add a special minimal index just for renormalizationElijah Newren2021-03-201-0/+20
* merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren2021-03-201-1/+7
* merge-ort: record the reason that we want a rename for a fileElijah Newren2021-03-181-5/+10
* diffcore-rename: add computation of number of unknown renamesElijah Newren2021-03-181-0/+3
* merge-ort: record the reason that we want a rename for a directoryElijah Newren2021-03-181-3/+38
* merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren2021-03-181-14/+14
* merge-ort: skip rename detection entirely if possibleElijah Newren2021-03-111-0/+44
* merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren2021-03-111-1/+1
* merge-ort: precompute whether directory rename detection is neededElijah Newren2021-03-111-6/+61
* merge-ort: introduce wrappers for alternate tree traversalElijah Newren2021-03-111-0/+71
* merge-ort: add data structures for an alternate tree traversalElijah Newren2021-03-111-0/+26
* merge-ort: precompute subset of sources for which we need rename detectionElijah Newren2021-03-111-3/+32
* diffcore-rename: enable filtering possible rename sourcesElijah Newren2021-03-111-0/+1
* diffcore-rename: add function for clearing dir_rename_countElijah Newren2021-02-271-9/+3
* Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren2021-02-271-129/+3
* merge-ort: call diffcore_rename() directlyElijah Newren2021-02-161-7/+59
* merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren2021-01-241-0/+57
* merge-ort: ignore the directory rename split conflict for nowElijah Newren2021-01-241-1/+12
* merge-ort: fix massive leakElijah Newren2021-01-241-0/+17
* Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano2021-01-211-22/+1228
|\
| * merge-ort: fix a directory rename detection bugElijah Newren2021-01-211-117/+81
| * merge-ort: process_renames() now needs more defensivenessElijah Newren2021-01-211-5/+21
| * merge-ort: implement apply_directory_rename_modifications()Elijah Newren2021-01-211-1/+167
| * merge-ort: add a new toplevel_dir fieldElijah Newren2021-01-211-6/+9
| * merge-ort: implement handle_path_level_conflicts()Elijah Newren2021-01-211-1/+71
| * merge-ort: implement check_for_directory_rename()Elijah Newren2021-01-211-1/+66
| * merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren2021-01-211-2/+35
| * merge-ort: implement compute_collisions()Elijah Newren2021-01-211-1/+67
| * merge-ort: modify collect_renames() for directory rename handlingElijah Newren2021-01-211-4/+74
| * merge-ort: implement handle_directory_level_conflicts()Elijah Newren2021-01-211-1/+18
| * merge-ort: implement compute_rename_counts()Elijah Newren2021-01-211-2/+52
| * merge-ort: copy get_renamed_dir_portion() from merge-recursive.cElijah Newren2021-01-211-0/+104
| * merge-ort: add outline of get_provisional_directory_renames()Elijah Newren2021-01-211-1/+56
| * merge-ort: add outline for computing directory renamesElijah Newren2021-01-211-1/+24
| * merge-ort: collect which directories are removed in dirs_removedElijah Newren2021-01-081-0/+27
| * merge-ort: initialize and free new directory rename data structuresElijah Newren2021-01-081-0/+35
| * 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 04:56:45 +0100