summaryrefslogtreecommitdiff
path: root/merge-ort.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano2021-10-251-14/+4
|\
| * merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan2021-10-081-14/+4
| * Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano2021-09-221-18/+35
| |\
* | \ Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-7/+1
|\ \ \
| * | | Remove ignored files by default when they are in the wayElijah Newren2021-09-271-1/+1
| * | | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-7/+1
* | | | Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano2021-10-061-18/+35
|\ \ \ \ | | |_|/ | |/| |
| * | | revision: remove "submodule" from opt structJonathan Tan2021-09-091-18/+35
* | | | Merge branch 'en/typofixes'Junio C Hamano2021-09-281-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge-ort: fix completely wrong commentElijah Newren2021-09-201-1/+1
| |/ /
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+15
|\ \ \ | |_|/ |/| |
| * | merge-ort: expand only for out-of-cone conflictsDerrick Stolee2021-09-091-3/+10
| * | merge: make sparse-aware with ORTDerrick Stolee2021-09-091-0/+8
| |/
* | Merge branch 'en/ort-perf-batch-15'Junio C Hamano2021-08-241-85/+103
|\ \ | |/ |/|
| * merge-ort: remove compile-time ability to turn off usage of memory poolsElijah Newren2021-08-031-162/+47
| * merge-ort: reuse path strings in pool_alloc_filespecElijah Newren2021-07-301-7/+22
| * merge-ort: store filepairs and filespecs in our mem_poolElijah Newren2021-07-301-12/+14
| * diffcore-rename, merge-ort: add wrapper functions for filepair alloc/deallocElijah Newren2021-07-301-0/+42
| * merge-ort: switch our strmaps over to using memory poolsElijah Newren2021-07-301-50/+75
| * merge-ort: set up a memory poolElijah Newren2021-07-301-0/+25
| * merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappersElijah Newren2021-07-301-0/+24
| * merge-ort: rename str{map,intmap,set}_func()Elijah Newren2021-07-301-13/+13
* | Merge branch 'en/ort-perf-batch-14'Junio C Hamano2021-08-041-11/+388
|\ \ | |/
| * merge-ort: restart merge with cached renames to reduce process entry costElijah Newren2021-07-201-6/+86
| * merge-ort: avoid recursing into directories when we don't need toElijah Newren2021-07-201-3/+99
| * merge-ort: defer recursing into directories when merge base is matchedElijah Newren2021-07-201-2/+31
| * merge-ort: add a handle_deferred_entries() helper functionElijah Newren2021-07-201-0/+64
| * merge-ort: add data structures for allowable trivial directory resolvesElijah Newren2021-07-201-0/+61
| * merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren2021-07-201-5/+15
| * merge-ort: resolve paths early when we have sufficient informationElijah Newren2021-07-201-0/+37
* | Merge branch 'en/rename-limits-doc'Junio C Hamano2021-07-281-1/+1
|\ \
| * | rename: bump limit defaults yet againElijah Newren2021-07-151-1/+1
* | | Merge branch 'ab/attribute-format'Junio C Hamano2021-07-281-0/+1
|\ \ \ | |_|/ |/| |
| * | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-131-0/+1
| |/
* | Merge branch 'ab/struct-init'Junio C Hamano2021-07-161-2/+2
|\ \
| * | string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason2021-07-011-2/+2
* | | Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano2021-07-161-1/+5
|\ \ \
| * | | merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren2021-06-301-1/+5
| |/ /
* | | Merge branch 'en/ort-perf-batch-13'Junio C Hamano2021-07-161-0/+50
|\ \ \
| * | | merge-ort: add prefetching for content mergesElijah Newren2021-06-281-0/+50
| | |/ | |/|
* | | Merge branch 'en/ort-perf-batch-12'Junio C Hamano2021-07-161-23/+57
|\ \ \ | |/ / |/| |
| * | merge-ort: miscellaneous touch-upsElijah Newren2021-06-091-0/+5
| * | Fix various issues found in commentsElijah Newren2021-06-091-3/+5
| * | merge-ort: replace string_list_df_name_compare with faster alternativeElijah Newren2021-06-091-20/+47
* | | Merge branch 'en/ort-perf-batch-11'Junio C Hamano2021-06-141-12/+319
|\ \ \ | |/ / | | / | |/ |/|
| * merge-ort, diffcore-rename: employ cached renames when possibleElijah Newren2021-05-201-5/+42
| * merge-ort: handle interactions of caching and rename/rename(1to1) casesElijah Newren2021-05-201-1/+29
| * merge-ort: add helper functions for using cached renamesElijah Newren2021-05-201-0/+47
| * merge-ort: preserve cached renames for the appropriate sideElijah Newren2021-05-201-9/+11
| * merge-ort: avoid accidental API mis-useElijah Newren2021-05-201-0/+7
View Lorry Controller Status