summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
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
2018-05-22Sync with Git 2.16.4Libravatar Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.15.2Libravatar Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.14.4Libravatar Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.13.7Libravatar Junio C Hamano1-2/+2
2018-05-21verify_path: disallow symlinks in .gitmodulesLibravatar Jeff King1-2/+2
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-05-10lock_file: make function-local locks non-staticLibravatar Martin Ågren1-1/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-2/+2
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2018-03-14Merge branch 'nd/parseopt-completion'Libravatar Junio C Hamano1-2/+3
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Libravatar Junio C Hamano1-61/+61
2018-02-28Merge branch 'tk/apply-dev-null-verify-name-fix'Libravatar Junio C Hamano1-1/+1
2018-02-22apply: rename 'new' variablesLibravatar Brandon Williams1-27/+27
2018-02-22apply: rename 'try' variablesLibravatar Brandon Williams1-34/+34
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-6/+6
2018-02-15apply: handle Subversion diffs with /dev/null gracefullyLibravatar Tatyana Krasnukha1-1/+1
2018-02-09completion: use __gitcomp_builtin in _git_applyLibravatar Nguyễn Thái Ngọc Duy1-2/+3
2018-01-30sha1_file: convert write_sha1_file to object_idLibravatar Patryk Obara1-4/+4
2018-01-30sha1_file: convert hash_sha1_file to object_idLibravatar Patryk Obara1-2/+2
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsLibravatar Torsten Bögershausen1-3/+3
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintLibravatar Junio C Hamano1-0/+2
2017-11-27Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Libravatar Junio C Hamano1-0/+2
2017-11-27Merge branch 'rs/apply-fuzzy-match-fix' into maintLibravatar Junio C Hamano1-39/+20
2017-11-21Merge branch 'rs/apply-fuzzy-match-fix'Libravatar Junio C Hamano1-39/+20