[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8f6b51 8496f56)
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:42:27 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:42:27 +0000 (11:42 -0800)
* jc/maint-lf-to-crlf-keep-crlf:
  lf_to_crlf_filter(): resurrect CRLF->CRLF hack

1  2 
convert.c patch | diff1 | diff2 | blob | history

diff --cc convert.c
Simple merge
Git - the stupid content tracker