Merge branch 'rs/commit-graph-use-list-count'
[git/git.git] / .gitattributes
... / ...
CommitLineData
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/Documentation/**/*.txt eol=lf
10/command-list.txt eol=lf
11/GIT-VERSION-GEN eol=lf
12/mergetools/* eol=lf
13/t/oid-info/* eol=lf
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