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)
commit3c362d4baa877bb9c6c332cfdc3aa81461e06024
tree9f201c9b203ff2fd2a7bf1d40c9b8ec1bf259a5d
parente24bd95879dbaf2a6232e7f621b0bab545319209
parentff68668695486b72b5f06146eddf85b70841088a
Merge branch 'mo/maint-crlf-doc' into maint

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