summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2021-04-16Merge branch 'ah/merge-ort-ubsan-fix'Junio C Hamano
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano
2021-04-16Merge branch 'en/ort-perf-batch-10'Junio C Hamano
2021-04-12merge-ort: only do pointer arithmetic for non-empty listsAndrzej Hunt
2021-04-08Merge branch 'en/ort-perf-batch-9'Junio C Hamano
2021-03-22Merge branch 'en/ort-perf-batch-8'Junio C Hamano
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren
2021-03-20merge-ort: support subtree shiftingElijah Newren
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteElijah Newren
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren
2021-03-20merge-ort: add a special minimal index just for renormalizationElijah Newren
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren
2021-03-18merge-ort: record the reason that we want a rename for a fileElijah Newren
2021-03-18diffcore-rename: add computation of number of unknown renamesElijah Newren
2021-03-18merge-ort: record the reason that we want a rename for a directoryElijah Newren
2021-03-18merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren
2021-03-14use CALLOC_ARRAYRené Scharfe
2021-03-11merge-ort: skip rename detection entirely if possibleElijah Newren
2021-03-11merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren
2021-03-11merge-ort: precompute whether directory rename detection is neededElijah Newren
2021-03-11merge-ort: introduce wrappers for alternate tree traversalElijah Newren
2021-03-11merge-ort: add data structures for an alternate tree traversalElijah Newren
2021-03-11merge-ort: precompute subset of sources for which we need rename detectionElijah Newren
2021-03-11diffcore-rename: enable filtering possible rename sourcesElijah Newren
2021-02-27diffcore-rename: add function for clearing dir_rename_countElijah Newren
2021-02-27Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-20 01:13:12 (GMT)