summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
2023-04-17Sync with 2.39.3Johannes Schindelin
2023-04-17Sync with 2.38.5Johannes Schindelin
2023-04-17Sync with 2.36.6Johannes Schindelin
2023-04-17Sync with 2.35.8Johannes Schindelin
2023-04-17Sync with 2.34.8Johannes Schindelin
2023-04-17Sync with 2.32.7Johannes Schindelin
2023-04-17Sync with 2.31.8Johannes Schindelin
2023-04-17Sync with 2.30.9Johannes Schindelin
2023-04-17apply --reject: overwrite existing `.rej` symlink if it existsJohannes Schindelin
2023-02-14Merge branch 'jk/unused-post-2.39' into maint-2.39Junio C Hamano
2023-02-13Sync with Git 2.39.2Junio C Hamano
2023-02-06Sync with 2.38.4Johannes Schindelin
2023-02-06Sync with 2.36.5Johannes Schindelin
2023-02-06Sync with 2.35.7Johannes Schindelin
2023-02-06Sync with 2.34.7Johannes Schindelin
2023-02-06Sync with 2.32.6Johannes Schindelin
2023-02-06Sync with 2.31.7Johannes Schindelin
2023-02-06Sync with 2.30.8Johannes Schindelin
2023-02-03apply: fix writing behind newly created symbolic linksPatrick Steinhardt
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-30Merge branch 'tb/cap-patch-at-1gb'Taylor Blau
2022-10-25apply: reject patches larger than ~1 GiBTaylor Blau
2022-10-17apply: mark unused parameters in noop error/warning routineJeff King
2022-10-17apply: 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-16Merge 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-25object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-25object-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-10-12Merge branch 'jc/trivial-threeway-binary-merge' into maintJunio C Hamano
2021-10-12Merge branch 'jk/apply-binary-hunk-parsing-fix' into maintJunio C Hamano
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