summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
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
2025-03-17merge-ort: remove extraneous word in commentElijah Newren
2025-03-17merge-ort: fix accidental strset<->strintmapElijah Newren
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt
2025-03-06merge-ort: fix slightly overzealous assertion for rename-to-selfElijah Newren
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt
2024-09-30diff: improve lifecycle management of diff queuesPatrick Steinhardt
2024-09-25Merge branch 'ak/typofix-2.46-maint'Junio C Hamano
2024-09-19merge-ort: fix typosAndrew Kreimer
2024-09-05merge-ort: fix two leaks when handling directory rename modificationsPatrick Steinhardt
2024-08-14merge-ort: unconditionally release attributes indexPatrick Steinhardt
2024-07-16Merge branch 'en/ort-inner-merge-error-fix'Junio C Hamano
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano
2024-07-06merge-ort: fix missing early returnElijah Newren
2024-06-20merge-ort: convert more error() cases to path_msg()Elijah Newren
2024-06-20merge-ort: upon merge abort, only show messages causing the abortElijah Newren
2024-06-20merge-ort: loosen commented requirementsElijah Newren
2024-06-20merge-ort: clearer propagation of failure-to-function from merge_submoduleElijah Newren
2024-06-20merge-ort: fix type of local 'clean' var in handle_content_merge ()Elijah Newren
2024-06-20merge-ort: maintain expected invariant for priv memberElijah Newren
2024-06-20merge-ort: extract handling of priv member into reusable functionElijah Newren
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt
2024-06-11merge: fix leaking merge basesPatrick Steinhardt
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano
2024-03-14merge options: add a conflict style memberPhillip Wood
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 15:14:06 +0000