summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
2019-11-10Merge branch 'dl/apply-3way-diff3'Libravatar Junio C Hamano1-1/+1
2019-10-24apply: respect merge.conflictStyle in --3wayLibravatar Denton Liu1-1/+1
2019-10-15Merge branch 'tg/range-diff-output-update'Libravatar Junio C Hamano1-21/+22
2019-10-09range-diff: don't segfault with mode-only changesLibravatar Thomas Gummerer1-21/+22
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Libravatar Junio C Hamano1-0/+11
2019-09-03am: reload .gitattributes after patching itLibravatar brian m. carlson1-0/+11
2019-07-11apply: make parse_git_diff_header publicLibravatar Thomas Gummerer1-50/+19
2019-07-11apply: only pass required data to gitdiff_* functionsLibravatar Thomas Gummerer1-24/+35
2019-07-09apply: only pass required data to find_name_*Libravatar Thomas Gummerer1-24/+24
2019-07-09apply: only pass required data to check_header_lineLibravatar Thomas Gummerer1-4/+4
2019-07-09apply: only pass required data to git_header_nameLibravatar Thomas Gummerer1-8/+8
2019-07-09apply: only pass required data to skip_tree_prefixLibravatar Thomas Gummerer1-9/+9
2019-07-09apply: replace marc.info link with public-inboxLibravatar Thomas Gummerer1-1/+1
2019-05-28fill_stat_cache_info(): prepare for an fsmonitor fixLibravatar Johannes Schindelin1-1/+1
2019-02-20completion: add more parameter value completionLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2019-02-06Merge branch 'jk/loose-object-cache-oid'Libravatar Junio C Hamano1-1/+1
2019-02-06Merge branch 'jk/unused-parameter-cleanup'Libravatar Junio C Hamano1-3/+2
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-2/+3
2019-01-24apply: drop unused "def" parameter from find_name_gnu()Libravatar Jeff King1-3/+2
2019-01-14Merge branch 'nd/checkout-noisy'Libravatar Junio C Hamano1-1/+2
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Libravatar Nguyễn Thái Ngọc Duy1-1/+2
2019-01-08convert has_sha1_file() callers to has_object_file()Libravatar Jeff King1-1/+1
2018-11-18Merge branch 'js/apply-recount-allow-noop'Libravatar Junio C Hamano1-1/+1
2018-11-14checkout: print something when checking out pathsLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-11-13apply --recount: allow "no-op hunks"Libravatar Johannes Schindelin1-1/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King1-0/+18
2018-11-06apply: return -1 from option callback instead of calling exit(1)Libravatar Jeff King1-1/+1
2018-11-06apply: mark include/exclude options as NONEGLibravatar Jeff King1-2/+2
2018-10-30Merge branch 'bc/hash-transition-part-15'Libravatar Junio C Hamano1-24/+26
2018-10-15apply: rename new_sha1_prefix and old_sha1_prefixLibravatar brian m. carlson1-20/+20
2018-10-15apply: replace hard-coded constantsLibravatar brian m. carlson1-8/+10
2018-09-21ws.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+5
2018-09-21rerere.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+6
2018-08-13apply.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-21/+25
2018-08-13apply.c: make init_apply_state() take a struct repositoryLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2018-08-13apply.c: pass struct apply_state to more functionsLibravatar Nguyễn Thái Ngọc Duy1-7/+11
2018-08-13convert.c: remove an implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano1-13/+11
2018-07-24Merge branch 'en/apply-comment-fix'Libravatar Junio C Hamano1-1/+1
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-13/+11
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-1/+1
2018-06-28apply: fix grammar error in commentLibravatar Elijah Newren1-1/+1
2018-06-25Merge branch 'nd/diff-apply-ita'Libravatar Junio C Hamano1-7/+12
2018-05-30Merge branch 'js/use-bug-macro'Libravatar Junio C Hamano1-2/+2
2018-05-30Merge branch 'ma/lockfile-cleanup'Libravatar Junio C Hamano1-1/+1
2018-05-29Sync with Git 2.17.1Libravatar Junio C Hamano1-2/+2
2018-05-29apply: add --intent-to-addLibravatar Nguyễn Thái Ngọc Duy1-7/+12