Merge branch 'mo/maint-crlf-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:11 +0000 (13:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:11 +0000 (13:52 -0800)
* mo/maint-crlf-doc:
  core.autocrlf documentation: mention the crlf attribute

1  2 
Documentation/config.txt

Simple merge