Merge branch 'tb/doc-eol-normalization'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:44 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:45 +0000 (22:07 -0700)
Doc update.

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

1  2 
Documentation/gitattributes.txt

Simple merge