summaryrefslogtreecommitdiffstats
path: root/apply.c
AgeCommit message (Expand)AuthorLines
2021-09-15Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano-0/+21
2021-09-05apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano-0/+21
2021-08-30Merge branch 'jk/apply-binary-hunk-parsing-fix'Junio C Hamano-0/+1
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksJeff King-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason-3/+3
2021-05-07Merge branch 'jz/apply-3way-first-message-fix'Junio C Hamano-1/+5
2021-04-29apply: adjust messages to account for --3way changesJerry Zhang-1/+5
2021-04-07git-apply: allow simultaneous --cached and --3way optionsJerry Zhang-3/+6
2021-04-06git-apply: try threeway first when "--3way" is usedJerry Zhang-7/+6
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano-0/+1
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares-0/+1
2021-03-13use CALLOC_ARRAYRené Scharfe-3/+3
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano-2/+0
2020-12-15style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason-2/+0
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano-1/+1
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares-1/+1
2020-10-20apply: when -R, also reverse list of sectionsJonathan Tan-2/+7
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano-2/+2
2020-08-17Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano-4/+21
2020-08-17config: drop git_config_get_string_const()Jeff King-2/+2
2020-08-09apply: make i-t-a entries never match worktreeRaymond E. Pasco-5/+19
2020-08-06apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco-4/+7
2020-08-06apply: do not lazy fetch when applying binaryJonathan Tan-1/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu-14/+14
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson-1/+1
2020-01-31sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares-2/+4
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano-0/+10
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano-1/+1
2019-12-06apply --allow-overlap: fix a corner caseJohannes Schindelin-0/+10
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano-2/+2
2019-11-30doc: replace public-inbox links with lore.kernel.orgJeff King-1/+1
2019-11-10Merge branch 'dl/apply-3way-diff3'Junio C Hamano-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren-2/+2
2019-10-24apply: respect merge.conflictStyle in --3wayDenton Liu-1/+1
2019-10-15Merge branch 'tg/range-diff-output-update'Junio C Hamano-21/+22
2019-10-09range-diff: don't segfault with mode-only changesThomas Gummerer-21/+22
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano-0/+11
2019-09-03am: reload .gitattributes after patching itbrian m. carlson-0/+11
2019-07-11apply: make parse_git_diff_header publicThomas Gummerer-50/+19
2019-07-11apply: only pass required data to gitdiff_* functionsThomas Gummerer-24/+35
2019-07-09apply: only pass required data to find_name_*Thomas Gummerer-24/+24
2019-07-09apply: only pass required data to check_header_lineThomas Gummerer-4/+4
2019-07-09apply: only pass required data to git_header_nameThomas Gummerer-8/+8
2019-07-09apply: only pass required data to skip_tree_prefixThomas Gummerer-9/+9
2019-07-09apply: replace marc.info link with public-inboxThomas Gummerer-1/+1
2019-05-28fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin-1/+1
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy-0/+4
2019-02-06Merge branch 'jk/loose-object-cache-oid'Junio C Hamano-1/+1
2019-02-06Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano-3/+2
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano-2/+3
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-01 05:10:15 +0000