diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-01-24 00:20:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 00:20:03 +0100 |
| commit | e90cdfd50768feb612dcea84ea25a725c72df39a (patch) | |
| tree | bdd151640dbbe35520823f2a649f56b24d8336e2 | |
| parent | 86244854b5ba02625e2eb03534cb0ec2a6c2f995 (diff) | |
| parent | 645b7c2c36a3d71de69af51a29a0d4d832b95cbd (diff) | |
| download | rust-e90cdfd50768feb612dcea84ea25a725c72df39a.tar.gz rust-e90cdfd50768feb612dcea84ea25a725c72df39a.zip | |
Rollup merge of #57858 - pietroalbini:ignore-eol-images, r=GuillaumeGomez
Ignore line ending on older git versions On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of `.png` and `.ico` files, and obviously it ruins them. This PR adds an attribute to those files to ignore which line ending they use. r? @GuillaumeGomez
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index b223c8ac5fb..f0b1c67bd0f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,7 @@ src/etc/installer/gfx/* binary *.woff binary src/vendor/** -text Cargo.lock -merge linguist-generated=false + +# Older git versions try to fix line endings on images, this prevents it. +*.png binary +*.ico binary |