summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
10 daysMerge branch 'ja/i18n-similar-messages'Junio C Hamano
10 daysMerge branch 'jz/apply-3-corner-cases'Junio C Hamano
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
2020-01-31sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano
2019-12-06apply --allow-overlap: fix a corner caseJohannes Schindelin
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano
2019-11-30doc: replace public-inbox links with lore.kernel.orgJeff King
2019-11-10Merge branch 'dl/apply-3way-diff3'Junio C Hamano
2019-11-10Fix spelling errors in code commentsElijah Newren
2019-10-24apply: respect merge.conflictStyle in --3wayDenton Liu
2019-10-15Merge branch 'tg/range-diff-output-update'Junio C Hamano
2019-10-09range-diff: don't segfault with mode-only changesThomas Gummerer
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano
2019-09-03am: reload .gitattributes after patching itbrian m. carlson
2019-07-11apply: make parse_git_diff_header publicThomas Gummerer
2019-07-11apply: only pass required data to gitdiff_* functionsThomas Gummerer
2019-07-09apply: only pass required data to find_name_*Thomas Gummerer
2019-07-09apply: only pass required data to check_header_lineThomas Gummerer
2019-07-09apply: only pass required data to git_header_nameThomas Gummerer