Skip to content

Commit 1f34e0c

Browse files
PhilipOakleygitster
authored andcommitted
.gitattributes: include text attribute for eol attributes
The standard advice for text file eol endings in the .gitattributes file was updated in e28eae3 (gitattributes: Document the unified "auto" handling, 2016-08-26) with a recent clarification in 8c591db (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 844ede3 commit 1f34e0c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.gitattributes

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
* whitespace=!indent,trail,space
22
*.[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
99
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
1515
/Documentation/git-merge.txt conflict-marker-size=32
1616
/Documentation/gitk.txt conflict-marker-size=32
1717
/Documentation/user-manual.txt conflict-marker-size=32

0 commit comments

Comments
 (0)