summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
2018-11-18Merge branch 'js/apply-recount-allow-noop'Junio C Hamano
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
2018-06-28apply: fix grammar error in commentElijah Newren
2018-06-25Merge branch 'nd/diff-apply-ita'Junio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano
2018-05-29Sync with Git 2.17.1Junio C Hamano
2018-05-29apply: add --intent-to-addNguyễn Thái Ngọc Duy
2018-05-22Sync with Git 2.16.4Junio C Hamano
2018-05-22Sync with Git 2.15.2Junio C Hamano
2018-05-22Sync with Git 2.14.4Junio C Hamano
2018-05-22Sync with Git 2.13.7Junio C Hamano
2018-05-22verify_path: disallow symlinks in .gitmodulesJeff King
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-10lock_file: make function-local locks non-staticMartin Ågren
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano
2018-02-28Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano
2018-02-22apply: rename 'new' variablesBrandon Williams
2018-02-22apply: rename 'try' variablesBrandon Williams
2018-02-15Merge branch 'po/object-id'Junio C Hamano
2018-02-15apply: handle Subversion diffs with /dev/null gracefullyTatyana Krasnukha
2018-02-09completion: use __gitcomp_builtin in _git_applyNguyễn Thái Ngọc Duy
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara
2018-01-30sha1_file: convert hash_sha1_file to object_idPatryk Obara
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano
2017-11-27Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano
2017-11-27Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano