diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-25 10:42:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-25 10:43:48 +0200 |
| commit | 900d90bb615590808bf2ae4396acf3937218e0f5 (patch) | |
| tree | a6cebc69008501fef25acec12cd225dd1f946836 /.gitattributes | |
| parent | a1a71c05baf7d139f76bd59440f5291867251db0 (diff) | |
Git: Explicitly list binary files as such to avoid EOL change
text=auto works well in Git 2.10+ but it's broken in previous versions,
which are still used in production on e.g. Ubuntu 16.04 LTS.
Also fix a couple missed text files with CRLF terminators.
.bat files likely require it to be processed properly on Windows,
but core.autocrlf should take care of converting them on the fly
when checking out on Windows.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index f2cf6ab63a..40a5e6183f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,13 @@ *.inc linguist-language=cpp thirdparty/* linguist-vendored +# Normalize EOL for all files that Git considers text files * text=auto eol=lf + +# The above only works properly for Git 2.10+, so for older versions +# we need to manually list the binary files we don't want modified. +*.icns binary +*.ico binary +*.jar binary +*.png binary +*.ttf binary |