Merge branch 'mo/maint-crlf-doc'
commit4075d27a65e00e8eb5124b70a37f6d25c5b14d35
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:29:57 +0000 (22 16:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:29:57 +0000 (22 16:29 -0800)
tree5b475fe62f0efb00d6c925c80e73fae75dfc1f3f
parentf328f35880678fadd460939fa06fff3c5a9d0838
parentff68668695486b72b5f06146eddf85b70841088a
Merge branch 'mo/maint-crlf-doc'

* mo/maint-crlf-doc:
  core.autocrlf documentation: mention the crlf attribute
Documentation/config.txt