summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2025-04-08merge-recursive.[ch]: thoroughly debug theseElijah Newren
2025-04-08merge-ort: enable diff-algorithms other than histogramElijah Newren
2025-02-13merge-recursive: optimize time complexity for process_renamesMeet Soni
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt
2024-06-11merge: fix leaking merge basesPatrick Steinhardt
2024-06-11merge-recursive: fix memory leak when finalizing mergePatrick Steinhardt
2024-06-11builtin/merge-recursive: fix leaking object ID basesPatrick Steinhardt
2024-06-11merge-recursive: fix leaking rename conflict infoPatrick 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-09merge-recursive: prepare for `merge_submodule()` to report errorsJohannes 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-23Always check `parse_tree*()`'s return valueJohannes Schindelin
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-10-11merge: introduce {copy|clear}_merge_options()Junio C Hamano
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman
2023-09-16merge-ort: lowercase a few error messagesJeff King
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21merge-ll: rename from ll-mergeElijah Newren
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-21cache.h: remove this no-longer-used headerElijah Newren
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren
2023-06-21name-hash.h: move declarations for name-hash.c from cache.hElijah Newren
2023-04-24match-trees.h: move declarations for match-trees.c functions from cache.hElijah Newren
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-02-23Remove unnecessary includes of builtin.hElijah Newren
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason
2022-11-27merge-recursive: fix variable typo in error messageKyle Meyer
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:38:29 +0000