]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2db93a8 4855de1)
Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
commit43240cb7316a7ea653ada00adfddd5ea80f90cf3
treeb6e0d121867132767c29b5d89d985abf08b24cbetree | snapshot
parent2db93a80d37d463ab66dc71ba4e10cbaae8f807fcommit | diff
parent4855de123391daab82407b44de03ba5647e97694commit | diff
Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint

"git apply --inaccurate-eof" when used with "--ignore-space-change"
triggered an internal sanity check, which has been fixed.

* rs/apply-inaccurate-eof-with-incomplete-line:
  apply: update line lengths for --inaccurate-eof
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.