summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-3/+3
* | | | | | | | | Merge branch 'ab/object-file-api-updates'Junio C Hamano2022-03-161-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason2022-02-251-2/+2
| * | | | | | | | | object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason2022-02-251-4/+4
| |/ / / / / / / /
* | | | | | | | | range-diff: plug memory leak in common invocationÆvar Arnfjörð Bjarmason2022-03-041-1/+6
* | | | | | | | | Merge branch 'en/remerge-diff'Junio C Hamano2022-02-161-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ll-merge: make callers responsible for showing warningsElijah Newren2022-02-021-1/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/apply-symlinks-use-strset'Junio C Hamano2022-02-051-34/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | apply: use strsets to track symlinksRené Scharfe2022-01-071-34/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: factorize "--foo outside a repository"Jean-Noël Avila2022-01-051-3/+3
| * | | | | | | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-1/+1
* | | | | | | | | Merge branch 'jz/apply-3-corner-cases'Junio C Hamano2022-01-101-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | git-apply: skip threeway in add / rename casesJerry Zhang2021-12-201-1/+3
| |/ / / / / / /
* | | | | | | | git-apply: add --allow-empty flagJerry Zhang2021-12-131-2/+6
* | | | | | | | git-apply: add --quiet flagJerry Zhang2021-12-131-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano2021-09-151-0/+21
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano2021-09-051-0/+21
| |/ / / / /
* | | | | | Merge branch 'jk/apply-binary-hunk-parsing-fix'Junio C Hamano2021-08-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | apply: keep buffer/size pair in sync when parsing binary hunksJeff King2021-08-101-0/+1
* | | | | string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason2021-07-011-3/+3
| |/ / / |/| | |
* | | | Merge branch 'jz/apply-3way-first-message-fix'Junio C Hamano2021-05-071-1/+5
|\ \ \ \
| * | | | apply: adjust messages to account for --3way changesJerry Zhang2021-04-291-1/+5
* | | | | git-apply: allow simultaneous --cached and --3way optionsJerry Zhang2021-04-071-3/+6
|/ / / /
* | | | git-apply: try threeway first when "--3way" is usedJerry Zhang2021-04-061-7/+6
* | | | Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano2021-04-021-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | entry: extract a header file for entry.c functionsMatheus Tavares2021-03-231-0/+1
| | |/ | |/|
* | | use CALLOC_ARRAYRené Scharfe2021-03-131-3/+3
|/ /
* | Merge branch 'ab/unreachable-break'Junio C Hamano2020-12-181-2/+0
|\ \
| * | style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2020-12-151-2/+0