summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2022-07-18Merge branch 'en/merge-dual-dir-renames-fix'Junio C Hamano
2022-07-06merge-ort: fix issue with dual rename and add/add conflictElijah Newren
2022-07-06merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren
2022-07-06merge-ort: make a separate function for freeing struct collisionsElijah Newren
2022-07-06merge-ort: small cleanups of check_for_directory_renameElijah Newren
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren
2022-06-22merge-ort: store more specific conflict informationElijah Newren
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin
2022-06-22merge-ort: store messages in a list, not in a single strbufJohannes Schindelin
2022-06-22merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren
2022-06-22merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren
2022-06-22merge-ort: split out a separate display_update_messages() functionElijah Newren
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-04-14revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason
2022-03-17Merge branch 'ab/string-list-count-in-size-t'Junio C Hamano
2022-03-17Merge branch 'ab/object-file-api-updates'Junio C Hamano
2022-03-13Merge branch 'en/merge-ort-align-verbosity-with-recursive'Junio C Hamano
2022-03-07string-list API: change "nr" and "alloc" to "size_t"Ævar Arnfjörð Bjarmason
2022-03-07Merge branch 'en/merge-ort-plug-leaks'Junio C Hamano
2022-03-02merge-ort: exclude messages from inner merges by defaultElijah Newren
2022-02-26object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-20merge-ort: fix small memory leak in unique_path()Elijah Newren
2022-02-20merge-ort: fix small memory leak in detect_and_process_renames()Elijah Newren
2022-02-17merge-ort: make informational messages from recursive merges clearerElijah Newren
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano
2022-02-09Merge branch 'en/plug-leaks-in-merge'Junio C Hamano
2022-02-09Merge branch 'en/merge-ort-restart-optim-fix'Junio C Hamano
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren
2022-02-02merge-ort: mark a few more conflict messages as omittableElijah Newren
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2022-01-21merge-ort: fix memory leak in merge_ort_internal()Elijah Newren
2022-01-17merge-ort: avoid assuming all renames detectedElijah Newren
2021-12-30merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-18 22:10:17 (GMT)