summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'nd/diff-apply-ita'Junio C Hamano2018-06-251-7/+12
|\ \
| * | apply: add --intent-to-addNguyễn Thái Ngọc Duy2018-05-291-7/+12
| |/
* | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-2/+2
|\ \
| * | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-2/+2
| |/
* | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-1/+1
|\ \
| * | lock_file: make function-local locks non-staticMartin Ågren2018-05-101-1/+1
* | | Sync with Git 2.17.1Junio C Hamano2018-05-291-2/+2
|\ \ \ | |_|/ |/| |
| * | Sync with Git 2.16.4Junio C Hamano2018-05-221-2/+2
| |\ \ | | |/ | |/|
| | * Sync with Git 2.15.2Junio C Hamano2018-05-221-2/+2
| | |\
| | | * Sync with Git 2.14.4Junio C Hamano2018-05-221-2/+2
| | | |\
| | | | * Sync with Git 2.13.7Junio C Hamano2018-05-221-2/+2
| | | | |\
| | | | | * verify_path: disallow symlinks in .gitmodulesJeff King2018-05-211-2/+2
| | | | | * Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
| | | | | |\
| | | | | * \ Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-101-6/+29
| | | | | |\ \
| | | | | * \ \ Merge branch 'jc/apply-fix-mismerge' into maintJunio C Hamano2017-06-041-169/+169
| | | | | |\ \ \
| | | * | | \ \ \ Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-061-0/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ Merge branch 'bc/object-id'Junio C Hamano2018-04-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* | | | | | | | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | completion: use __gitcomp_builtin in _git_applyNguyễn Thái Ngọc Duy2018-02-091-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-61/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: rename 'new' variablesBrandon Williams2018-02-221-27/+27
| * | | | | | | | | | apply: rename 'try' variablesBrandon Williams2018-02-221-34/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano2018-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: handle Subversion diffs with /dev/null gracefullytk/apply-dev-null-verify-name-fixTatyana Krasnukha2018-02-151-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano2017-09-101-7/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano2017-09-101-5/+36
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'po/object-id'Junio C Hamano2018-02-151-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-301-4/+4
| * | | | | | | | | | | | sha1_file: convert hash_sha1_file to object_idPatryk Obara2018-01-301-2/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-171-0/+2
* | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano2017-11-211-39/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fixRené Scharfe2017-11-121-39/+20
* | | | | | | | | | | apply: remove `newfd` from `struct apply_state`Martin Ågren2017-10-061-11/+6
* | | | | | | | | | | apply: move lockfile into `apply_state`Martin Ågren2017-10-061-9/+5
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-1/+2
* | | | | | | | | | Merge branch 'rs/apply-epoch'Junio C Hamano2017-09-101-19/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: remove epoch date from regexrs/apply-epochRené Scharfe2017-08-251-7/+5
| * | | | | | | | | | apply: check date of potential epoch timestamps firstRené Scharfe2017-08-251-16/+17
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-261-5/+36
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-191-5/+36
* | | | | | | | | | Merge branch 'rs/apply-lose-prefix-length'Junio C Hamano2017-08-221-7/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | apply: remove prefix_length member from apply_staters/apply-lose-prefix-lengthRené Scharfe2017-08-091-7/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/move-array'Junio C Hamano2017-08-111-7/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-171-7/+4
| | |/ / / / / / | |/| | | | | |
View Lorry Controller Status