]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/streaming-filter' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:09:28 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:09:28 +0000 (17:09 -0700)
* jc/streaming-filter:
  t0021: test application of both crlf and ident
  t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
  streaming: filter cascading
  streaming filter: ident filter
  Add LF-to-CRLF streaming conversion
  stream filter: add "no more input" to the filters
  Add streaming filter API
  convert.h: move declarations for conversion from cache.h

1  2 
cache.h

diff --cc cache.h
Simple merge