diff options
Diffstat (limited to 'third_party/git/.gitattributes')
| -rw-r--r-- | third_party/git/.gitattributes | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/third_party/git/.gitattributes b/third_party/git/.gitattributes new file mode 100644 index 000000000000..b08a1416d860 --- /dev/null +++ b/third_party/git/.gitattributes @@ -0,0 +1,17 @@ +* whitespace=!indent,trail,space +*.[ch] whitespace=indent,trail,space diff=cpp +*.sh whitespace=indent,trail,space eol=lf +*.perl eol=lf diff=perl +*.pl eof=lf diff=perl +*.pm eol=lf diff=perl +*.py eol=lf diff=python +*.bat eol=crlf +/Documentation/**/*.txt eol=lf +/command-list.txt eol=lf +/GIT-VERSION-GEN eol=lf +/mergetools/* eol=lf +/t/oid-info/* 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 |