summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2026-07-06Merge branch 'en/ort-harden-against-corrupt-trees'Junio C Hamano1-34/+44
2026-06-15odb: use size_t for object_info.sizep and the size APIsJohannes Schindelin1-1/+1
2026-06-14merge-ort: abort merge when trees have duplicate entriesElijah Newren1-27/+34
2026-06-14merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()Elijah Newren1-0/+2
2026-06-14merge-ort: drop unnecessary show_all_errors from collect_merge_info()Elijah Newren1-1/+0
2026-06-14merge-ort: propagate callback errors from traverse_trees_wrapper()Elijah Newren1-6/+8
2026-04-22merge-ort: handle cached rename & trivial resolution interaction betterElijah Newren1-26/+22
2026-02-21merge-ort: prevent the_repository from coming backElijah Newren1-0/+8
2026-02-21merge-ort: replace the_hash_algo with opt->repo->hash_algoElijah Newren1-13/+13
2026-02-21merge-ort: replace the_repository with opt->repoElijah Newren1-21/+21
2026-02-21merge-ort: pass repository to write_tree()Elijah Newren1-8/+8
2026-02-21merge,diff: remove the_repository check before prefetching blobsElijah Newren1-1/+1
2026-02-17Merge branch 'rs/xdiff-wo-the-repository'Junio C Hamano1-3/+3
2026-02-13Merge branch 'ps/commit-list-functions-renamed'Junio C Hamano1-3/+3
2026-02-10xdiff-interface: stop using the_repositoryRené Scharfe1-3/+3
2026-02-05global: constify some pointers that are not written toCollin Funk1-1/+1
2026-01-15commit: rename `free_commit_list()` to conform to coding guidelinesPatrick Steinhardt1-1/+1
2026-01-15commit: rename `reverse_commit_list()` to conform to coding guidelinesPatrick Steinhardt1-1/+1
2026-01-15commit: rename `copy_commit_list()` to conform to coding guidelinesPatrick Steinhardt1-1/+1
2026-01-09cocci: convert parse_tree functions to repo_ variantsRené Scharfe1-6/+7
2026-01-08Merge branch 'en/ort-recursive-d-f-conflict-fix'Junio C Hamano1-1/+34
2025-12-30merge-ort: fix corner case recursive submodule/directory conflict handlingElijah Newren1-1/+34
2025-11-26Merge branch 'ad/blame-diff-algorithm'Junio C Hamano1-1/+0
2025-11-17merge-ort: fix failing merges in special corner caseElijah Newren1-1/+28
2025-11-17merge-ort: remove debugging crudElijah Newren1-1/+1
2025-11-17xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch1-1/+0
2025-10-15Merge branch 'en/ort-rename-fixes' into maint-2.51Junio C Hamano1-15/+40
2025-08-21Merge branch 'en/ort-rename-fixes'Junio C Hamano1-15/+40
2025-08-07merge-ort: fix directory rename on top of source of other rename/deleteElijah Newren1-5/+13
2025-08-07merge-ort: fix incorrect file handlingElijah Newren1-0/+14
2025-08-07merge-ort: clarify the interning of strings in opt->priv->pathElijah Newren1-3/+8
2025-08-07merge-ort: drop unnecessary temporary in check_for_directory_rename()Elijah Newren1-4/+2
2025-08-07merge-ort: update comments to modern testfile locationElijah Newren1-3/+3
2025-08-05Merge branch 'ps/object-file-wo-the-repository'Junio C Hamano1-3/+4
2025-07-23config: drop `git_config_get_bool()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config_get_int()` wrapperPatrick Steinhardt1-3/+3
2025-07-23config: drop `git_config_get_string()` wrapperPatrick Steinhardt1-4/+4
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-07-16odb: introduce `odb_write_object()`Patrick Steinhardt1-3/+4
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt1-1/+1
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt1-2/+2
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-05-16merge-ort: add a new mergeability_only optionElijah Newren1-7/+31
2025-04-24Merge branch 'ps/object-file-cleanup'Junio C Hamano1-1/+2
2025-04-17Merge branch 'en/merge-recursive-debug'Junio C Hamano1-3/+159
2025-04-15Merge branch 'ps/object-wo-the-repository'Junio C Hamano1-13/+13
2025-04-15object-file: split out functions relating to object store subsystemPatrick Steinhardt1-1/+2
2025-04-08Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanupJunio C Hamano1-13/+13
2025-04-08merge-recursive.[ch]: thoroughly debug theseElijah Newren1-0/+159
2025-04-08merge-ort: enable diff-algorithms other than histogramElijah Newren1-3/+0
generated by cgit (git 2.54.0.dirty) at 2026-09-13 00:51:57 +0000