Merge branch 'jc/ci-upload-artifact-and-linux32'
[git/gitster.git] / .gitattributes
blob158c3d45c4c10cb19c7d3fb02d6bfdaf7a1794f1
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace=indent,trail,space diff=cpp
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 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
18 /t/t????-*.sh conflict-marker-size=32