summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2021-09-20merge-ort: fix completely wrong commentLibravatar Elijah Newren1-1/+1
2021-08-04Merge branch 'en/ort-perf-batch-14'Libravatar Junio C Hamano1-11/+388
2021-07-28Merge branch 'en/rename-limits-doc'Libravatar Junio C Hamano1-1/+1
2021-07-28Merge branch 'ab/attribute-format'Libravatar Junio C Hamano1-0/+1
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costLibravatar Elijah Newren1-6/+86
2021-07-20merge-ort: avoid recursing into directories when we don't need toLibravatar Elijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedLibravatar Elijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionLibravatar Elijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesLibravatar Elijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Libravatar Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationLibravatar Elijah Newren1-0/+37
2021-07-16Merge branch 'ab/struct-init'Libravatar Junio C Hamano1-2/+2
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Libravatar Junio C Hamano1-1/+5
2021-07-16Merge branch 'en/ort-perf-batch-13'Libravatar Junio C Hamano1-0/+50
2021-07-16Merge branch 'en/ort-perf-batch-12'Libravatar Junio C Hamano1-23/+57
2021-07-15rename: bump limit defaults yet againLibravatar Elijah Newren1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Libravatar Ævar Arnfjörð Bjarmason1-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Libravatar Ævar Arnfjörð Bjarmason1-2/+2
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsLibravatar Elijah Newren1-1/+5
2021-06-28merge-ort: add prefetching for content mergesLibravatar Elijah Newren1-0/+50
2021-06-14Merge branch 'en/ort-perf-batch-11'Libravatar Junio C Hamano1-12/+319
2021-06-09merge-ort: miscellaneous touch-upsLibravatar Elijah Newren1-0/+5
2021-06-09Fix various issues found in commentsLibravatar Elijah Newren1-3/+5
2021-06-09merge-ort: replace string_list_df_name_compare with faster alternativeLibravatar Elijah Newren1-20/+47
2021-05-20merge-ort, diffcore-rename: employ cached renames when possibleLibravatar Elijah Newren1-5/+42
2021-05-20merge-ort: handle interactions of caching and rename/rename(1to1) casesLibravatar Elijah Newren1-1/+29
2021-05-20merge-ort: add helper functions for using cached renamesLibravatar Elijah Newren1-0/+47
2021-05-20merge-ort: preserve cached renames for the appropriate sideLibravatar Elijah Newren1-9/+11
2021-05-20merge-ort: avoid accidental API mis-useLibravatar Elijah Newren1-0/+7
2021-05-20merge-ort: add code to check for whether cached renames can be reusedLibravatar Elijah Newren1-2/+64
2021-05-20merge-ort: populate caches of rename detection resultsLibravatar Elijah Newren1-1/+72
2021-05-20merge-ort: add data structures for in-memory caching of rename detectionLibravatar Elijah Newren1-0/+53
2021-05-16Merge branch 'ah/merge-ort-i18n'Libravatar Junio C Hamano1-6/+15
2021-05-11merge-ort: split "distinct types" message into two translatable messagesLibravatar Alex Henrie1-6/+15
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Libravatar Junio C Hamano1-10/+10
2021-04-30Merge branch 'ds/sparse-index-protections'Libravatar Junio C Hamano1-1/+1
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-10/+10
2021-04-16Merge branch 'ah/merge-ort-ubsan-fix'Libravatar Junio C Hamano1-14/+6
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-28/+215
2021-04-16Merge branch 'en/ort-perf-batch-10'Libravatar Junio C Hamano1-18/+61
2021-04-12merge-ort: only do pointer arithmetic for non-empty listsLibravatar Andrzej Hunt1-13/+5
2021-04-08Merge branch 'en/ort-perf-batch-9'Libravatar Junio C Hamano1-4/+230
2021-03-22Merge branch 'en/ort-perf-batch-8'Libravatar Junio C Hamano1-138/+6
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Libravatar Elijah Newren1-12/+1
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren1-0/+10
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren1-13/+30
2021-03-20merge-ort: support subtree shiftingLibravatar Elijah Newren1-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationLibravatar Elijah Newren1-0/+20
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 03:15:11 +0000