squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #57858 - pietroalbini:ignore-eol-images, r=GuillaumeGomez

Browse source 
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
This commit is contained in:
Mazdak Farrokhzad 2019-01-24 00:20:03 +01:00 committed by GitHub
commit e90cdfd507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored
View file

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