tree 994be5d93287d7ae614c510807716c62ddfe2260
parent b2fc9d2fb02782a20d4370d7989be8b0a54f1017
parent c9446f0504e4b785758eed0b63c7e00c1b7091ba
author Junio C Hamano <gitster@pobox.com> 1549519523 -0800
committer Junio C Hamano <gitster@pobox.com> 1549519523 -0800

Merge branch 'jk/autocrlf-overrides-eol-doc'

Documentation around core.crlf has been updated.

* jk/autocrlf-overrides-eol-doc:
  docs/config: clarify "text property" in core.eol
  doc/gitattributes: clarify "autocrlf overrides eol"