Merge branch 'da/difftool-dir-diff-symlink-fix' into maint
[git.git] / .gitattributes
blobb0044cf272fec9b987e99c600d6a95bc357261c3
1 * whitespace=!indent,trail,space
2 *.[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
9 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
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