.gitattributes: include `text` attribute for eol attributes
The standard advice for text file eol endings in the .gitattributes file was updated in e28eae3184 (gitattributes: Document the unified "auto" handling, 2016-08-26) with a recent clarification in 8c591dbfce (docs: correct documentation about eol attribute, 2022-01-11), with a follow up comment by the original author in [1] confirming the use of the eol attribute in conjunction with the text attribute. Update Git's .gitattributes file to reflect our own advice. [1] https://lore.kernel.org/git/?q=%3C20220216115239.uo2ie3flaqo3nf2d%40tb-raspi4%3E. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley committed
Feb 3, 2023 at 12:59 UTC
1f34e0cd3d799acb5118b3276dde389821bffdd4
1 file changed
+11
-11
.gitattributes
+11
-11
@@ -1,17 +1,17 @@
1
* whitespace=!indent,trail,space
2
*.[ch] whitespace=indent,trail,space diff=cpp
3
-*.sh whitespace=indent,trail,space eol=lf
4
-*.perl eol=lf diff=perl
5
-*.pl eof=lf diff=perl
6
-*.pm eol=lf diff=perl
7
-*.py eol=lf diff=python
8
-*.bat eol=crlf
3
+*.sh whitespace=indent,trail,space text eol=lf
4
+*.perl text eol=lf diff=perl
5
+*.pl text eof=lf diff=perl
6
+*.pm text eol=lf diff=perl
7
+*.py text eol=lf diff=python
8
+*.bat text eol=crlf
9
CODE_OF_CONDUCT.md -whitespace
10
-/Documentation/**/*.txt eol=lf
11
-/command-list.txt eol=lf
12
-/GIT-VERSION-GEN eol=lf
13
-/mergetools/* eol=lf
14
-/t/oid-info/* eol=lf
10
+/Documentation/**/*.txt text eol=lf
11
+/command-list.txt text eol=lf
12
+/GIT-VERSION-GEN text eol=lf
13
+/mergetools/* text eol=lf
14
+/t/oid-info/* text eol=lf
15
/Documentation/git-merge.txt conflict-marker-size=32
16
/Documentation/gitk.txt conflict-marker-size=32
17
/Documentation/user-manual.txt conflict-marker-size=32