Merge pull request #29166 from akien-mga/teach-git-what-binaries-are

Git: Explicitly list binary files as such to avoid EOL change
This commit is contained in:
Max Hilbrunner 2019-05-25 15:45:46 +02:00 committed by GitHub
commit 5c1cce6e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 137 additions and 128 deletions

9
.gitattributes vendored
View File

@ -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