summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano2020-12-081-1/+1
|\ \ \
| * | | apply: don't use core.sharedRepository to create working tree filesMatheus Tavares2020-12-021-1/+1
| |/ /
* | | apply: when -R, also reverse list of sectionsJonathan Tan2020-10-201-2/+7
|/ /
* | Merge branch 'jk/leakfix'Junio C Hamano2020-08-271-2/+2
|\ \
| * | config: drop git_config_get_string_const()Jeff King2020-08-171-2/+2
* | | Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano2020-08-171-4/+21
|\ \ \
| * | | apply: make i-t-a entries never match worktreeRaymond E. Pasco2020-08-091-5/+19
| * | | apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco2020-08-061-4/+7
| |/ /
* | | apply: do not lazy fetch when applying binaryJonathan Tan2020-08-061-1/+1
|/ /
* | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-14/+14
* | convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-161-1/+1
* | sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares2020-01-311-2/+4
* | Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano2019-12-161-0/+10
|\ \
| * | apply --allow-overlap: fix a corner caseJohannes Schindelin2019-12-061-0/+10
* | | Merge branch 'jk/lore-is-the-archive'Junio C Hamano2019-12-061-1/+1
|\ \ \
| * | | doc: replace public-inbox links with lore.kernel.orgJeff King2019-11-301-1/+1
* | | | Merge branch 'en/doc-typofix'Junio C Hamano2019-12-011-2/+2
|\ \ \ \
| * | | | Fix spelling errors in code commentsElijah Newren2019-11-101-2/+2
| | |/ / | |/| |
View Lorry Controller Status