projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2bb76e1 59f5ced)
Merge branch 'bg/apply-fix-blank-at-eof'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
commit31fbae0f813b47801ee79a464a8257346a5f8f2c
treec592774728ed75406480d5d21fa4fdf61ef1cf61tree | snapshot
parent2bb76e139e3ab503992d227103f2bbb806b1f04bcommit | diff
parent59f5ced65b46370a121916593cce7fcd210a15dfcommit | diff
Merge branch 'bg/apply-fix-blank-at-eof'

* 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
builtin/apply.c diff1 | diff2 | blob | history
Git—the stupid content tracker