]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2fc9d2 c9446f0)
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)
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"

1  2 
Documentation/gitattributes.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/gitattributes.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.