development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'po/attributes-text'

Browse source 
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
This commit is contained in:
Junio C Hamano 2023-02-15 17:11:52 -08:00
parent a232de58f2 1f34e0cd3d
commit f7c208cdf5
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.gitattributes vendored
View file

@ -1,17 +1,17 @@
* whitespace=!indent,trail,space * whitespace=!indent,trail,space
*.[ch] whitespace=indent,trail,space diff=cpp *.[ch] whitespace=indent,trail,space diff=cpp
*.sh whitespace=indent,trail,space eol=lf *.sh whitespace=indent,trail,space text eol=lf
*.perl eol=lf diff=perl *.perl text eol=lf diff=perl
*.pl eof=lf diff=perl *.pl text eof=lf diff=perl
*.pm eol=lf diff=perl *.pm text eol=lf diff=perl
*.py eol=lf diff=python *.py text eol=lf diff=python
*.bat eol=crlf *.bat text eol=crlf
CODE_OF_CONDUCT.md -whitespace CODE_OF_CONDUCT.md -whitespace
/Documentation/**/*.txt eol=lf /Documentation/**/*.txt text eol=lf
/command-list.txt eol=lf /command-list.txt text eol=lf
/GIT-VERSION-GEN eol=lf /GIT-VERSION-GEN text eol=lf
/mergetools/* eol=lf /mergetools/* text eol=lf
/t/oid-info/* eol=lf /t/oid-info/* text eol=lf
/Documentation/git-merge.txt conflict-marker-size=32 /Documentation/git-merge.txt conflict-marker-size=32
/Documentation/gitk.txt conflict-marker-size=32 /Documentation/gitk.txt conflict-marker-size=32
/Documentation/user-manual.txt conflict-marker-size=32 /Documentation/user-manual.txt conflict-marker-size=32