Skip to content

Commit f7c208c

Browse files
committed
Merge branch 'po/attributes-text'
In-tree .gitattributes update to match the way we recommend our users to mark a file as text. * po/attributes-text: .gitattributes: include `text` attribute for eol attributes
2 parents a232de5 + 1f34e0c commit f7c208c

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)