projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c36594 284e3d2)
Merge branch 'cn/maint-lf-to-crlf-filter'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:49:45 +0000 (22:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:49:45 +0000 (22:49 -0800)
* cn/maint-lf-to-crlf-filter:
  convert: track state in LF-to-CRLF filter

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

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