| commit | 23838b8a152a6363e22fdbe3f474fab904f701b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Dec 2011 19:42:27 +0000 (28 11:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Dec 2011 19:42:27 +0000 (28 11:42 -0800) | ||
| tree | 987a3bc21fe943cd3ffba1eb112e4d9c955f233c | treesnapshot (tar.gz zip) |
| parent | e8f6b51a6bcc904b8a5fed831f718c3f9ed7ef34 | commitdiff |
| parent | 8496f568739626c86cb9d82e57fc0b55cb4c0849 | commitdiff |
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
* jc/maint-lf-to-crlf-keep-crlf:
lf_to_crlf_filter(): resurrect CRLF->CRLF hack
* jc/maint-lf-to-crlf-keep-crlf:
lf_to_crlf_filter(): resurrect CRLF->CRLF hack
| convert.c | diff1 | diff2 | blobhistory |