projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32238ae 5de7166)
Merge branch 'jc/apply-trailing-blank-removal'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:10:23 +0000 (22:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:10:23 +0000 (22:10 -0800)
commit1965f8cdbdf86930b99fd61ed2efb22ac3d6a725
tree69bc7a0dc0ee9c83f126523c4412bebc31e33b36tree | snapshot
parent32238aeb730fda0f66ccc6ec2f1e342af8b9fd04commit | diff
parent5de7166d46d25fed3b8a181c3842cf4350ecdea4commit | diff
Merge branch 'jc/apply-trailing-blank-removal'

Fix to update_pre_post_images() that did not take into account the
possibility that whitespace fix could shrink the preimage and
change the number of lines in it.

* 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