| commit | 7842c44ccb89dc6c88e67bcc559bc9b38c617e0c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 15:33:08 +0000 (14 07:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 15:33:08 +0000 (14 07:33 -0800) | ||
| tree | 1a38b06514b6b94e9310bf18f72634bcfdb97ab0 | treesnapshot (tar.gz zip) |
| parent | 659742f796b5502e3917fbdbd1d7400c9648b180 | commitdiff |
| parent | 5de7166d46d25fed3b8a181c3842cf4350ecdea4 | commitdiff |
Merge branch 'jc/apply-trailing-blank-removal' into maint
"git apply" misbehaved when fixing whitespace breakages by removing
excess trailing blank lines.
* jc/apply-trailing-blank-removal:
apply.c:update_pre_post_images(): the preimage can be truncated
"git apply" misbehaved when fixing whitespace breakages by removing
excess trailing blank lines.
* jc/apply-trailing-blank-removal:
apply.c:update_pre_post_images(): the preimage can be truncated
| builtin/apply.c | diff1 | diff2 | blobhistory |