Merge branch 'cc/svn-fe-py-shebang'
[git/git.git] / .gitattributes
CommitLineData
14f9e128 1* whitespace=!indent,trail,space
e82675a0 2*.[ch] whitespace=indent,trail,space diff=cpp
00ddc9d1 3*.sh whitespace=indent,trail,space eol=lf
20460635
ÆAB
4*.perl eol=lf diff=perl
5*.pl eof=lf diff=perl
6*.pm eol=lf diff=perl
7818b619 7*.py eol=lf diff=python
a5bdf9fd 8*.bat eol=crlf
54709d52 9/Documentation/**/*.txt eol=lf
00ddc9d1
JS
10/command-list.txt eol=lf
11/GIT-VERSION-GEN eol=lf
12/mergetools/* eol=lf
fc767afe 13/t/oid-info/* eol=lf
b9b07efd
TG
14/Documentation/git-merge.txt conflict-marker-size=32
15/Documentation/gitk.txt conflict-marker-size=32
16/Documentation/user-manual.txt conflict-marker-size=32
17/t/t????-*.sh conflict-marker-size=32