]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a7bd4f 87afe9a)
Merge branch 'cn/maint-lf-to-crlf-filter' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:44 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:44 +0000 (11:42 -0800)
commit3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355
treef7fd3cf7157af8a870c2e011b7e8fe8b5ba0691dtree | snapshot
parent1a7bd4fcfa0c57617828dfc1b6b525af674f6d49commit | diff
parent87afe9a5ed759668e35513c44eacd2fd393ba658commit | diff
Merge branch 'cn/maint-lf-to-crlf-filter' into maint

* cn/maint-lf-to-crlf-filter:
  lf_to_crlf_filter(): tell the caller we added "\n" when draining
  convert: track state in LF-to-CRLF filter
convert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.