From: Junio C Hamano <gitster@pobox.com> Date: Thu, 7 Feb 2019 06:05:23 +0000 (-0800) Subject: Merge branch 'jk/autocrlf-overrides-eol-doc' X-Git-Tag: v2.21.0-rc0~21 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13e263095b55c88b7af86c3c88f8b0f937eb4d5c;p=git 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" --- 13e263095b55c88b7af86c3c88f8b0f937eb4d5c