summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano
2021-09-28Merge branch 'en/typofixes'Junio C Hamano
2021-09-27Remove ignored files by default when they are in the wayElijah Newren
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-09-23Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-20merge-ort: fix completely wrong commentElijah Newren
2021-09-09merge-ort: expand only for out-of-cone conflictsDerrick Stolee
2021-09-09merge: make sparse-aware with ORTDerrick Stolee
2021-09-09revision: remove "submodule" from opt structJonathan Tan
2021-08-24Merge branch 'en/ort-perf-batch-15'Junio C Hamano
2021-08-04Merge branch 'en/ort-perf-batch-14'Junio C Hamano
2021-08-03merge-ort: remove compile-time ability to turn off usage of memory poolsElijah Newren
2021-07-30merge-ort: reuse path strings in pool_alloc_filespecElijah Newren
2021-07-30merge-ort: store filepairs and filespecs in our mem_poolElijah Newren
2021-07-30diffcore-rename, merge-ort: add wrapper functions for filepair alloc/deallocElijah Newren
2021-07-30merge-ort: switch our strmaps over to using memory poolsElijah Newren
2021-07-30merge-ort: set up a memory poolElijah Newren
2021-07-30merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappersElijah Newren
2021-07-30merge-ort: rename str{map,intmap,set}_func()Elijah Newren
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano
2021-07-28Merge branch 'ab/attribute-format'Junio C Hamano
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren
2021-07-20merge-ort: avoid recursing into directories when we don't need toElijah Newren
2021-07-20merge-ort: defer recursing into directories when merge base is matchedElijah Newren
2021-07-20merge-ort: add a handle_deferred_entries() helper functionElijah Newren
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesElijah Newren
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren
2021-07-20merge-ort: resolve paths early when we have sufficient informationElijah Newren
2021-07-17Merge branch 'ab/struct-init'Junio C Hamano
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-07-15rename: bump limit defaults yet againElijah Newren
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 04:30:59 (GMT)