aboutsummaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2026-02-21merge-ort: prevent the_repository from coming backElijah Newren
2026-02-21merge-ort: replace the_hash_algo with opt->repo->hash_algoElijah Newren
2026-02-21merge-ort: replace the_repository with opt->repoElijah Newren
2026-02-21merge-ort: pass repository to write_tree()Elijah Newren
2026-02-21merge,diff: remove the_repository check before prefetching blobsElijah Newren
2026-02-17Merge branch 'rs/xdiff-wo-the-repository'Junio C Hamano
2026-02-13Merge branch 'ps/commit-list-functions-renamed'Junio C Hamano
2026-02-10xdiff-interface: stop using the_repositoryRené Scharfe
2026-02-05global: constify some pointers that are not written toCollin Funk
2026-01-15commit: rename `free_commit_list()` to conform to coding guidelinesPatrick Steinhardt
2026-01-15commit: rename `reverse_commit_list()` to conform to coding guidelinesPatrick Steinhardt
2026-01-15commit: rename `copy_commit_list()` to conform to coding guidelinesPatrick Steinhardt
2026-01-09cocci: convert parse_tree functions to repo_ variantsRené Scharfe
2026-01-08Merge branch 'en/ort-recursive-d-f-conflict-fix'Junio C Hamano
2025-12-30merge-ort: fix corner case recursive submodule/directory conflict handlingElijah Newren
2025-11-26Merge branch 'ad/blame-diff-algorithm'Junio C Hamano
2025-11-17merge-ort: fix failing merges in special corner caseElijah Newren
2025-11-17merge-ort: remove debugging crudElijah Newren
2025-11-17xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch
2025-10-15Merge branch 'en/ort-rename-fixes' into maint-2.51Junio C Hamano
2025-08-21Merge branch 'en/ort-rename-fixes'Junio C Hamano
2025-08-07merge-ort: fix directory rename on top of source of other rename/deleteElijah Newren
2025-08-07merge-ort: fix incorrect file handlingElijah Newren
2025-08-07merge-ort: clarify the interning of strings in opt->priv->pathElijah Newren
2025-08-07merge-ort: drop unnecessary temporary in check_for_directory_rename()Elijah Newren
2025-08-07merge-ort: update comments to modern testfile locationElijah Newren
2025-08-05Merge branch 'ps/object-file-wo-the-repository'Junio C Hamano
2025-07-23config: drop `git_config_get_bool()` wrapperPatrick Steinhardt
2025-07-23config: drop `git_config_get_int()` wrapperPatrick Steinhardt
2025-07-23config: drop `git_config_get_string()` wrapperPatrick Steinhardt
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt
2025-07-16odb: introduce `odb_write_object()`Patrick Steinhardt
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt
2025-05-16merge-ort: add a new mergeability_only optionElijah Newren
2025-04-24Merge branch 'ps/object-file-cleanup'Junio C Hamano
2025-04-17Merge branch 'en/merge-recursive-debug'Junio C Hamano
2025-04-15Merge branch 'ps/object-wo-the-repository'Junio C Hamano
2025-04-15object-file: split out functions relating to object store subsystemPatrick Steinhardt
2025-04-08Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanupJunio C Hamano
2025-04-08merge-recursive.[ch]: thoroughly debug theseElijah Newren
2025-04-08merge-ort: enable diff-algorithms other than histogramElijah Newren
2025-04-08Merge branch 'en/assert-wo-side-effects'Junio C Hamano
2025-03-29Merge branch 'en/random-cleanups'Junio C Hamano
2025-03-29Merge branch 'en/merge-ort-prepare-to-remove-recursive'Junio C Hamano
2025-03-21treewide: replace assert() with ASSERT() in special casesElijah Newren
2025-03-18merge-ort: fix merge.directoryRenames=falseElijah Newren
2025-03-18merge-ort: allow rename detection to be disabledElijah Newren
2025-03-18merge-ort: add new merge_ort_generic() functionElijah Newren
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 10:07:15 +0000