summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason
2022-12-13ws: drop unused parameter from ws_blank_line()Jeff King
2022-10-31Merge branch 'tb/cap-patch-at-1gb'Taylor Blau
2022-10-25apply: reject patches larger than ~1 GiBTaylor Blau
2022-10-18apply: mark unused parameters in noop error/warning routineJeff King
2022-10-18apply: mark unused parameters in handlersJeff King
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-03-17Merge branch 'ab/object-file-api-updates'Junio C Hamano
2022-03-04range-diff: plug memory leak in common invocationÆvar Arnfjörð Bjarmason
2022-02-26object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-26object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano
2022-02-05Merge branch 'rs/apply-symlinks-use-strset'Junio C Hamano
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano
2022-01-10Merge branch 'jz/apply-3-corner-cases'Junio C Hamano
2022-01-07apply: use strsets to track symlinksRené Scharfe
2022-01-05i18n: factorize "--foo outside a repository"Jean-Noël Avila
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2021-12-20git-apply: skip threeway in add / rename casesJerry Zhang
2021-12-13git-apply: add --allow-empty flagJerry Zhang
2021-12-13git-apply: add --quiet flagJerry Zhang
2021-09-15Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano
2021-09-05apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano
2021-08-30Merge branch 'jk/apply-binary-hunk-parsing-fix'Junio C Hamano
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksJeff King
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason
2021-05-07Merge branch 'jz/apply-3way-first-message-fix'Junio C Hamano
2021-04-29apply: adjust messages to account for --3way changesJerry Zhang
2021-04-08git-apply: allow simultaneous --cached and --3way optionsJerry Zhang
2021-04-07git-apply: try threeway first when "--3way" is usedJerry Zhang
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares
2021-03-14use CALLOC_ARRAYRené Scharfe
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano
2020-12-16style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares
2020-10-20apply: when -R, also reverse list of sectionsJonathan Tan
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano
2020-08-18Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano
2020-08-17config: drop git_config_get_string_const()Jeff King
2020-08-09apply: make i-t-a entries never match worktreeRaymond E. Pasco
2020-08-06apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco
2020-08-06apply: do not lazy fetch when applying binaryJonathan Tan
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson