diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2019-05-25 15:45:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-25 15:45:46 +0200 |
| commit | 5c1cce6e3f7d9679152762506ffafcb29e3f72c9 (patch) | |
| tree | c3168a6ff130feb3965c56fd38b39409508ab1f7 /.gitattributes | |
| parent | a4b250d1aef8b84cf090ecd965628c9e616340c5 (diff) | |
| parent | 900d90bb615590808bf2ae4396acf3937218e0f5 (diff) | |
Merge pull request #29166 from akien-mga/teach-git-what-binaries-are
Git: Explicitly list binary files as such to avoid EOL change
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 |