diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:09:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:09:28 -0700 |
| commit | 9901923cf0994582592a34128a466c58735621fd (patch) | |
| tree | 7be514ed228dc739c45eba83085a7b5a38614963 /Documentation/git-merge.txt | |
| parent | cce347da05fea3c18aeb4f11fa672d0ce7908a13 (diff) | |
| parent | 6b6cab3f9af2ab7010592e50bb343b990a6a7666 (diff) | |
| download | git-9901923cf0994582592a34128a466c58735621fd.tar.gz | |
Merge branch 'jc/streaming-filter' into next
* 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
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions