mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
1f34e0cd3d
The standard advice for text file eol endings in the .gitattributes file was updated ine28eae3184(gitattributes: Document the unified "auto" handling, 2016-08-26) with a recent clarification in8c591dbfce(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>
19 lines
630 B
Plaintext
19 lines
630 B
Plaintext
* whitespace=!indent,trail,space
|
|
*.[ch] whitespace=indent,trail,space diff=cpp
|
|
*.sh whitespace=indent,trail,space text eol=lf
|
|
*.perl text eol=lf diff=perl
|
|
*.pl text eof=lf diff=perl
|
|
*.pm text eol=lf diff=perl
|
|
*.py text eol=lf diff=python
|
|
*.bat text eol=crlf
|
|
CODE_OF_CONDUCT.md -whitespace
|
|
/Documentation/**/*.txt text eol=lf
|
|
/command-list.txt text eol=lf
|
|
/GIT-VERSION-GEN text eol=lf
|
|
/mergetools/* text eol=lf
|
|
/t/oid-info/* text eol=lf
|
|
/Documentation/git-merge.txt conflict-marker-size=32
|
|
/Documentation/gitk.txt conflict-marker-size=32
|
|
/Documentation/user-manual.txt conflict-marker-size=32
|
|
/t/t????-*.sh conflict-marker-size=32
|