projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 659742f 5de7166)
Merge branch 'jc/apply-trailing-blank-removal' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:08 +0000 (07:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:08 +0000 (07:33 -0800)
commit7842c44ccb89dc6c88e67bcc559bc9b38c617e0c
tree1a38b06514b6b94e9310bf18f72634bcfdb97ab0tree | snapshot
parent659742f796b5502e3917fbdbd1d7400c9648b180commit | diff
parent5de7166d46d25fed3b8a181c3842cf4350ecdea4commit | diff
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
builtin/apply.c diff1 | diff2 | blob | history
Git—the stupid content tracker