summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/leakfix'Junio C Hamano2020-08-271-2/+2
|\
| * config: drop git_config_get_string_const()Jeff King2020-08-171-2/+2
* | Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano2020-08-171-4/+21
|\ \
| * | apply: make i-t-a entries never match worktreeRaymond E. Pasco2020-08-091-5/+19
| * | apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco2020-08-061-4/+7
| |/
* | apply: do not lazy fetch when applying binaryJonathan Tan2020-08-061-1/+1
|/
* Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-14/+14
* convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-161-1/+1
* sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares2020-01-311-2/+4
* Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano2019-12-161-0/+10
|\
| * apply --allow-overlap: fix a corner caseJohannes Schindelin2019-12-061-0/+10
* | Merge branch 'jk/lore-is-the-archive'Junio C Hamano2019-12-061-1/+1
|\ \
| * | doc: replace public-inbox links with lore.kernel.orgJeff King2019-11-301-1/+1
* | | Merge branch 'en/doc-typofix'Junio C Hamano2019-12-011-2/+2
|\ \ \
| * | | Fix spelling errors in code commentsElijah Newren2019-11-101-2/+2
| | |/ | |/|
* | | Merge branch 'dl/apply-3way-diff3'Junio C Hamano2019-11-101-1/+1
|\ \ \ | |/ / |/| |
| * | apply: respect merge.conflictStyle in --3wayDenton Liu2019-10-241-1/+1
| |/
* | Merge branch 'tg/range-diff-output-update'Junio C Hamano2019-10-151-21/+22
|\ \
| * | range-diff: don't segfault with mode-only changesThomas Gummerer2019-10-091-21/+22
| |/
* | Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano2019-09-091-0/+11
|\ \ | |/ |/|
| * am: reload .gitattributes after patching itbrian m. carlson2019-09-031-0/+11
* | apply: make parse_git_diff_header publicThomas Gummerer2019-07-111-50/+19
* | apply: only pass required data to gitdiff_* functionsThomas Gummerer2019-07-111-24/+35
* | apply: only pass required data to find_name_*Thomas Gummerer2019-07-091-24/+24
* | apply: only pass required data to check_header_lineThomas Gummerer2019-07-091-4/+4
* | apply: only pass required data to git_header_nameThomas Gummerer2019-07-091-8/+8
* | apply: only pass required data to skip_tree_prefixThomas Gummerer2019-07-091-9/+9
* | apply: replace marc.info link with public-inboxThomas Gummerer2019-07-091-1/+1
|/
* fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin2019-05-281-1/+1
* completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
* Merge branch 'jk/loose-object-cache-oid'Junio C Hamano2019-02-061-1/+1
|\
| * convert has_sha1_file() callers to has_object_file()Jeff King2019-01-081-1/+1
* | Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano2019-02-061-3/+2
|\ \
| * | apply: drop unused "def" parameter from find_name_gnu()Jeff King2019-01-241-3/+2
* | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-2/+3
|\ \ \ | |/ / |/| |
| * | read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
| * | repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+2
| |/
* | Merge branch 'nd/checkout-noisy'Junio C Hamano2019-01-141-1/+2
|\ \ | |/ |/|
| * checkout: print something when checking out pathsNguyễn Thái Ngọc Duy2018-11-141-1/+2
* | Merge branch 'js/apply-recount-allow-noop'Junio C Hamano2018-11-181-1/+1
|\ \
| * | apply --recount: allow "no-op hunks"Johannes Schindelin2018-11-131-1/+1
* | | assert NOARG/NONEG behavior of parse-options callbacksJeff King2018-11-061-0/+18
* | | apply: return -1 from option callback instead of calling exit(1)Jeff King2018-11-061-1/+1
* | | apply: mark include/exclude options as NONEGJeff King2018-11-061-2/+2
| |/ |/|
* | Merge branch 'bc/hash-transition-part-15'Junio C Hamano2018-10-301-24/+26
|\ \
| * | apply: rename new_sha1_prefix and old_sha1_prefixbrian m. carlson2018-10-151-20/+20
| * | apply: replace hard-coded constantsbrian m. carlson2018-10-151-8/+10
| |/
* | ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+5
* | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* | ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+6
|/
View Lorry Controller Status