summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-141-4/+25
* Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-24/+44
|\
| * merge: fix leaking merge basesPatrick Steinhardt2024-06-111-19/+30
| * merge-recursive: fix memory leak when finalizing mergePatrick Steinhardt2024-06-111-0/+3
| * builtin/merge-recursive: fix leaking object ID basesPatrick Steinhardt2024-06-111-4/+4
| * merge-recursive: fix leaking rename conflict infoPatrick Steinhardt2024-06-111-1/+7
* | global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+3
|/
* Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano2024-04-011-1/+4
|\
| * merge options: add a conflict style memberPhillip Wood2024-03-141-0/+3
| * merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-1/+1
* | Merge branch 'eb/hash-transition'Junio C Hamano2024-03-281-1/+1
|\ \
| * | tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman2023-10-021-1/+1
* | | Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-15/+62
|\ \ \
| * | | merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin2024-03-091-0/+8
| * | | merge-recursive: prepare for `merge_submodule()` to report errorsJohannes Schindelin2024-03-091-6/+7
| * | | commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-1/+3
| * | | commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin2024-02-281-9/+45
| | |/ | |/|
* | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-1/+2
|\ \ \ | |/ / |/| |
| * | Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-1/+2
* | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-5/+0
|/ /
* | merge: introduce {copy|clear}_merge_options()Junio C Hamano2023-10-111-0/+16
* | merge-ort: lowercase a few error messagesJeff King2023-09-171-2/+2
|/
* treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* merge-ll: rename from ll-mergeElijah Newren2023-06-211-1/+1
* repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren2023-06-211-0/+1
* name-hash.h: move declarations for name-hash.c from cache.hElijah Newren2023-06-211-0/+1
* match-trees.h: move declarations for match-trees.c functions from cache.hElijah Newren2023-04-241-0/+1
* symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren2023-04-241-0/+1
* object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-4/+5
|\
| * libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
* | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | Remove unnecessary includes of builtin.hElijah Newren2023-02-241-1/+0
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason2023-01-171-1/+1
* cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason2023-01-161-1/+1
* merge-recursive: fix variable typo in error messageKyle Meyer2022-11-271-1/+1
* git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-6/+6
* mark unused read_tree_recursive() callback parametersJeff King2022-08-191-1/+1
* hashmap: mark unused callback parametersJeff King2022-08-191-5/+5
* Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-2/+3
|\
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 11:07:41 +0100