projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 846b8f6 59f5ced)
Merge branch 'bg/apply-fix-blank-at-eof' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700)
commit7b676b1bb53c936770a07354ec6c6550fb31b421
treeee46af290fec7e3bdf30b5759a887928c9a15147tree | snapshot
parent846b8f681a0a75cec2b930007c84e98346940459commit | diff
parent59f5ced65b46370a121916593cce7fcd210a15dfcommit | diff
Merge branch 'bg/apply-fix-blank-at-eof' into maint

* bg/apply-fix-blank-at-eof:
  t3417: Add test cases for "rebase --whitespace=fix"
  t4124: Add additional tests of --whitespace=fix
  apply: Allow blank context lines to match beyond EOF
  apply: Remove the quick rejection test
  apply: Don't unnecessarily update line lengths in the preimage
Unnamed repository; edit this file 'description' to name the repository.