Merge branch 'tb/doc-eol-normalization' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:01 +0000 (22:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:01 +0000 (22:10 -0700)
commitfe15d04d0a40e996aa862c09593ae3a53d32812c
tree1da2a7deb0df09806e46f61b408ab7ab897ad57e
parentd8f507e951ba34c3d08791f859baf7ef674ed894
parent85999743e74e35b9100cbeb94112a8ac39ab5a0e
Merge branch 'tb/doc-eol-normalization' into next

Doc update.

* tb/doc-eol-normalization:
  gitattributes.txt: document how to normalize the line endings
Documentation/gitattributes.txt