summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-091-0/+3
|\
| * ws.h: move declarations for ws.c functions from cache.hElijah Newren2023-04-241-0/+1
| * base85.h: move declarations for base85.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
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+2
|\ \ | |/
| * 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-5/+8
| |\
* | \ Sync with Git 2.40.1Junio C Hamano2023-04-241-2/+12
|\ \ \
| * \ \ Sync with 2.39.3Johannes Schindelin2023-04-171-2/+12
| |\ \ \
| | * \ \ Sync with 2.38.5Johannes Schindelin2023-04-171-2/+12
| | |\ \ \
| | | * \ \ Sync with 2.36.6Johannes Schindelin2023-04-171-2/+12
| | | |\ \ \
| | | | * \ \ Sync with 2.35.8Johannes Schindelin2023-04-171-2/+12
| | | | |\ \ \
| | | | | * \ \ Sync with 2.34.8Johannes Schindelin2023-04-171-2/+12
| | | | | |\ \ \
| | | | | | * \ \ Sync with 2.32.7Johannes Schindelin2023-04-171-2/+12
| | | | | | |\ \ \
| | | | | | | * \ \ Sync with 2.31.8Johannes Schindelin2023-04-171-2/+12
| | | | | | | |\ \ \
| | | | | | | | * \ \ Sync with 2.30.9Johannes Schindelin2023-04-171-2/+12
| | | | | | | | |\ \ \
| | | | | | | | | * | | apply --reject: overwrite existing `.rej` symlink if it existsJohannes Schindelin2023-04-171-2/+12
| | * | | | | | | | | | Merge branch 'jk/unused-post-2.39' into maint-2.39Junio C Hamano2023-02-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | setup.h: move declarations for setup.c functions from cache.hElijah Newren2023-03-211-0/+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
| * | | | | | | | | | | | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | | | | | | | | | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | | | | | | | | | | | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+6
| * | | | | | | | | | | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
* | | | | | | | | | | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-231-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Sync with Git 2.39.2Junio C Hamano2023-02-131-0/+27
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Sync with 2.38.4Johannes Schindelin2023-02-061-0/+27
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Sync with 2.36.5Johannes Schindelin2023-02-061-0/+27
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Sync with 2.35.7Johannes Schindelin2023-02-061-0/+27
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Sync with 2.34.7Johannes Schindelin2023-02-061-0/+27
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Sync with 2.32.6Johannes Schindelin2023-02-061-0/+27
| | | | | |\ \ \ \ \ | | | | | | | |/ / / | | | | | | |/| | |
| | | | | | * | | | Sync with 2.31.7Johannes Schindelin2023-02-061-0/+27
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | * | | Sync with 2.30.8Johannes Schindelin2023-02-061-0/+27
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | apply: fix writing behind newly created symbolic linksPatrick Steinhardt2023-02-031-0/+27
| | | | | * | | | | Merge branch 'jc/trivial-threeway-binary-merge' into maintJunio C Hamano2021-10-121-0/+21
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch 'jk/apply-binary-hunk-parsing-fix' into maintJunio C Hamano2021-10-121-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
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | ws: drop unused parameter from ws_blank_line()Jeff King2022-12-131-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'tb/cap-patch-at-1gb'Taylor Blau2022-10-301-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: reject patches larger than ~1 GiBTaylor Blau2022-10-251-1/+11
| |/ / / / / / / / /
* | | | | | | | | | apply: mark unused parameters in noop error/warning routineJeff King2022-10-171-1/+1
* | | | | | | | | | apply: mark unused parameters in handlersJeff King2022-10-171-8/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-201-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |