summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2021-07-17Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano
2021-07-17Merge branch 'en/ort-perf-batch-13'Junio C Hamano
2021-07-17Merge branch 'en/ort-perf-batch-12'Junio C Hamano
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren
2021-06-28merge-ort: add prefetching for content mergesElijah Newren
2021-06-14Merge branch 'en/ort-perf-batch-11'Junio C Hamano
2021-06-09merge-ort: miscellaneous touch-upsElijah Newren
2021-06-09Fix various issues found in commentsElijah Newren
2021-06-09merge-ort: replace string_list_df_name_compare with faster alternativeElijah Newren
2021-05-20merge-ort, diffcore-rename: employ cached renames when possibleElijah Newren
2021-05-20merge-ort: handle interactions of caching and rename/rename(1to1) casesElijah Newren
2021-05-20merge-ort: add helper functions for using cached renamesElijah Newren
2021-05-20merge-ort: preserve cached renames for the appropriate sideElijah Newren
2021-05-20merge-ort: avoid accidental API mis-useElijah Newren
2021-05-20merge-ort: add code to check for whether cached renames can be reusedElijah Newren
2021-05-20merge-ort: populate caches of rename detection resultsElijah Newren
2021-05-20merge-ort: add data structures for in-memory caching of rename detectionElijah Newren
2021-05-16Merge branch 'ah/merge-ort-i18n'Junio C Hamano
2021-05-11merge-ort: split "distinct types" message into two translatable messagesAlex Henrie
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-23 18:31:15 (GMT)