summary refs log tree commit diff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
2022-03-16Merge branch 'ab/object-file-api-updates'Junio C Hamano1-6/+6
2022-03-04range-diff: plug memory leak in common invocationÆvar Arnfjörð Bjarmason1-1/+6
2022-02-25object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-2/+2
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-4/+4
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-1/+4
2022-02-05Merge branch 'rs/apply-symlinks-use-strset'Junio C Hamano1-34/+8
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+4
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+4
2022-01-10Merge branch 'jz/apply-3-corner-cases'Junio C Hamano1-1/+3
2022-01-07apply: use strsets to track symlinksRené Scharfe1-34/+8
2022-01-05i18n: factorize "--foo outside a repository"Jean-Noël Avila1-3/+3
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-1/+1
2021-12-20git-apply: skip threeway in add / rename casesJerry Zhang1-1/+3
2021-12-13git-apply: add --allow-empty flagJerry Zhang1-2/+6
2021-12-13git-apply: add --quiet flagJerry Zhang1-1/+1
2021-09-15Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano1-0/+21
2021-09-05apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano1-0/+21
2021-08-30Merge branch 'jk/apply-binary-hunk-parsing-fix'Junio C Hamano1-0/+1
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksJeff King1-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason1-3/+3
2021-05-07Merge branch 'jz/apply-3way-first-message-fix'Junio C Hamano1-1/+5
2021-04-29apply: adjust messages to account for --3way changesJerry Zhang1-1/+5
2021-04-07git-apply: allow simultaneous --cached and --3way optionsJerry Zhang1-3/+6
2021-04-06git-apply: try threeway first when "--3way" is usedJerry Zhang1-7/+6
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano1-0/+1
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-3/+3
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano1-2/+0
2020-12-15style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason1-2/+0
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano1-1/+1
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares1-1/+1
2020-10-20apply: when -R, also reverse list of sectionsJonathan Tan1-2/+7
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano1-2/+2
2020-08-17Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano1-4/+21
2020-08-17config: drop git_config_get_string_const()Jeff King1-2/+2
2020-08-09apply: make i-t-a entries never match worktreeRaymond E. Pasco1-5/+19
2020-08-06apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco1-4/+7
2020-08-06apply: do not lazy fetch when applying binaryJonathan Tan1-1/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-14/+14
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson1-1/+1
2020-01-31sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares1-2/+4
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano1-0/+10
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano1-1/+1
2019-12-06apply --allow-overlap: fix a corner caseJohannes Schindelin1-0/+10
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano1-2/+2
2019-11-30doc: replace public-inbox links with lore.kernel.orgJeff King1-1/+1
2019-11-10Merge branch 'dl/apply-3way-diff3'Junio C Hamano1-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren1-2/+2
2019-10-24apply: respect merge.conflictStyle in --3wayDenton Liu1-1/+1
2019-10-15Merge branch 'tg/range-diff-output-update'Junio C Hamano1-21/+22
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-20 11:10:45 +0000