summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)Author
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
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
2017-11-21Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano
2017-11-17apply: update line lengths for --inaccurate-eofRené Scharfe
2017-11-12apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe
2017-10-06apply: remove `newfd` from `struct apply_state`Martin Ågren
2017-10-06apply: move lockfile into `apply_state`Martin Ågren
2017-09-22consistently use "fallthrough" comments in switchesJeff King
2017-09-10Merge branch 'rs/apply-epoch'Junio C Hamano
2017-09-10Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano
2017-09-10Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano
2017-08-27Merge branch 'tb/apply-with-crlf'Junio C Hamano
2017-08-25apply: remove epoch date from regexRené Scharfe
2017-08-25apply: check date of potential epoch timestamps firstRené Scharfe
2017-08-22Merge branch 'rs/apply-lose-prefix-length'Junio C Hamano
2017-08-19apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen
2017-08-11Merge branch 'rs/move-array'Junio C Hamano
2017-08-09apply: remove prefix_length member from apply_stateRené Scharfe
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano
2017-07-17apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano