summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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-231-1/+0
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-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
|\
| * revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-0/+1
| * string_list API users: use string_list_init_{no,}dupÆvar Arnfjörð Bjarmason2022-04-131-2/+2
* | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-201-6/+6
|\ \ | |/ |/|
| * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-6/+6
* | Merge branch 'ab/object-file-api-updates'Junio C Hamano2022-03-161-1/+1
|\ \
| * | object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason2022-02-251-1/+1
| |/
* | merge-ort: format messages slightly different for use in headersElijah Newren2022-02-021-0/+4
* | ll-merge: make callers responsible for showing warningsElijah Newren2022-02-021-1/+4
|/
* Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano2021-10-251-21/+20
|\
| * merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan2021-10-081-21/+20
| * Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano2021-09-221-17/+32
| |\
* | \ Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-1/+4
|\ \ \
| * | | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-7/+1
| * | | read-tree, merge-recursive: overwrite ignored files by defaultElijah Newren2021-09-271-1/+10
* | | | Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano2021-10-061-17/+32
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | revision: remove "submodule" from opt structJonathan Tan2021-09-091-17/+32
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+3
|\ \ \ | |_|/ |/| |
| * | merge: make sparse-aware with ORTDerrick Stolee2021-09-091-0/+3
| |/
* | merge-recursive: use fspathcmp() in path_hashmap_cmp()René Scharfe2021-08-301-4/+1
|/
* use fspathhash() everywhereRené Scharfe2021-07-301-8/+3
* Merge branch 'en/rename-limits-doc'Junio C Hamano2021-07-281-1/+1
|\
| * rename: bump limit defaults yet againElijah Newren2021-07-151-1/+1
* | Merge branch 'ab/attribute-format'Junio C Hamano2021-07-281-0/+1
|\ \
| * | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-131-0/+1
| |/
* | Merge branch 'ab/struct-init'Junio C Hamano2021-07-161-2/+2
|\ \
| * | string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason2021-07-011-2/+2
* | | Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano2021-07-161-6/+13
|\ \ \ | |_|/ |/| |
| * | merge-recursive: handle rename-to-self caseElijah Newren2021-06-301-6/+13
| |/
* | *: fix typos which duplicate a wordAndrei Rybak2021-06-141-1/+1
|/
View Lorry Controller Status