]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/autocrlf-overrides-eol-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:23 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:23 +0000 (22:05 -0800)
commit13e263095b55c88b7af86c3c88f8b0f937eb4d5c
tree994be5d93287d7ae614c510807716c62ddfe2260
parentb2fc9d2fb02782a20d4370d7989be8b0a54f1017
parentc9446f0504e4b785758eed0b63c7e00c1b7091ba
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"
Documentation/gitattributes.txt