summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
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
2019-07-09apply: only pass required data to skip_tree_prefixThomas Gummerer
2019-07-09apply: replace marc.info link with public-inboxThomas Gummerer
2019-05-28fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy
2019-02-07Merge branch 'jk/loose-object-cache-oid'Junio C Hamano
2019-02-07Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-24apply: drop unused "def" parameter from find_name_gnu()Jeff King
2019-01-14Merge branch 'nd/checkout-noisy'Junio C Hamano
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy
2019-01-08convert has_sha1_file() callers to has_object_file()Jeff King
2018-11-18Merge branch 'js/apply-recount-allow-noop'Junio C Hamano
2018-11-14checkout: print something when checking out pathsNguyễn Thái Ngọc Duy
2018-11-13apply --recount: allow "no-op hunks"Johannes Schindelin
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King
2018-11-06apply: return -1 from option callback instead of calling exit(1)Jeff King
2018-11-06apply: mark include/exclude options as NONEGJeff King
2018-10-30Merge branch 'bc/hash-transition-part-15'Junio C Hamano
2018-10-15apply: rename new_sha1_prefix and old_sha1_prefixbrian m. carlson
2018-10-15apply: replace hard-coded constantsbrian m. carlson
2018-09-21ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-13apply.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-13apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy
2018-08-13apply.c: pass struct apply_state to more functionsNguyễn Thái Ngọc Duy
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano
2018-07-24Merge branch 'en/apply-comment-fix'Junio C Hamano
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller