summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2022-03-06Merge branch 'en/merge-ort-plug-leaks'Libravatar Junio C Hamano1-19/+17
2022-02-20merge-ort: fix small memory leak in unique_path()Libravatar Elijah Newren1-9/+12
2022-02-20merge-ort: fix small memory leak in detect_and_process_renames()Libravatar Elijah Newren1-10/+5
2022-02-17merge-ort: make informational messages from recursive merges clearerLibravatar Elijah Newren1-0/+5
2022-02-16Merge branch 'en/remerge-diff'Libravatar Junio C Hamano1-5/+50
2022-02-09Merge branch 'en/plug-leaks-in-merge'Libravatar Junio C Hamano1-5/+5
2022-02-09Merge branch 'en/merge-ort-restart-optim-fix'Libravatar Junio C Hamano1-0/+4
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableLibravatar Elijah Newren1-1/+3
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersLibravatar Elijah Newren1-0/+1
2022-02-02merge-ort: format messages slightly different for use in headersLibravatar Elijah Newren1-2/+40
2022-02-02merge-ort: mark a few more conflict messages as omittableLibravatar Elijah Newren1-2/+2
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionLibravatar Elijah Newren1-2/+3
2022-02-02ll-merge: make callers responsible for showing warningsLibravatar Elijah Newren1-1/+4
2022-01-21merge-ort: fix memory leak in merge_ort_internal()Libravatar Elijah Newren1-5/+5
2022-01-17merge-ort: avoid assuming all renames detectedLibravatar Elijah Newren1-0/+4
2021-12-30merge-ort: fix bug with renormalization and rename/delete conflictsLibravatar Elijah Newren1-3/+16
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Libravatar Junio C Hamano1-14/+4
2021-10-13Merge branch 'en/removing-untracked-fixes'Libravatar Junio C Hamano1-7/+1
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Libravatar Jonathan Tan1-14/+4
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Libravatar Junio C Hamano1-18/+35
2021-09-28Merge branch 'en/typofixes'Libravatar Junio C Hamano1-1/+1
2021-09-27Remove ignored files by default when they are in the wayLibravatar Elijah Newren1-1/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-7/+1
2021-09-22Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Libravatar Junio C Hamano1-18/+35
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Libravatar Junio C Hamano1-0/+15
2021-09-20merge-ort: fix completely wrong commentLibravatar Elijah Newren1-1/+1
2021-09-09merge-ort: expand only for out-of-cone conflictsLibravatar Derrick Stolee1-3/+10
2021-09-09merge: make sparse-aware with ORTLibravatar Derrick Stolee1-0/+8
2021-09-09revision: remove "submodule" from opt structLibravatar Jonathan Tan1-18/+35
2021-08-24Merge branch 'en/ort-perf-batch-15'Libravatar Junio C Hamano1-85/+103
2021-08-04Merge branch 'en/ort-perf-batch-14'Libravatar Junio C Hamano1-11/+388
2021-08-03merge-ort: remove compile-time ability to turn off usage of memory poolsLibravatar Elijah Newren1-162/+47
2021-07-30merge-ort: reuse path strings in pool_alloc_filespecLibravatar Elijah Newren1-7/+22
2021-07-30merge-ort: store filepairs and filespecs in our mem_poolLibravatar Elijah Newren1-12/+14
2021-07-30diffcore-rename, merge-ort: add wrapper functions for filepair alloc/deallocLibravatar Elijah Newren1-0/+42
2021-07-30merge-ort: switch our strmaps over to using memory poolsLibravatar Elijah Newren1-50/+75
2021-07-30merge-ort: set up a memory poolLibravatar Elijah Newren1-0/+25
2021-07-30merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappersLibravatar Elijah Newren1-0/+24
2021-07-30merge-ort: rename str{map,intmap,set}_func()Libravatar Elijah Newren1-13/+13
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:01:22 +0000