diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 8ce9c6b888..49b3051641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,15 @@ * whitespace=!indent,trail,space *.[ch] whitespace=indent,trail,space diff=cpp *.sh whitespace=indent,trail,space eol=lf -*.perl eol=lf -*.pm eol=lf +*.perl eol=lf diff=perl +*.pl eof=lf diff=perl +*.pm eol=lf diff=perl +*.py eol=lf diff=python /Documentation/git-*.txt eol=lf /command-list.txt eol=lf /GIT-VERSION-GEN eol=lf /mergetools/* 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 |