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

Doc update.

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