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