X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitattributes;h=a7de7ce85593c140267bd3bafa3812859d8f259f;hb=3eeefc21f1a3ed9755c072c83808ed5c087b8c9a;hp=7f25bddc06cfefdbf78a4c681b3dc3ec79731a0b;hpb=2dca249da08e059adf083171414a24d2c039b8cb;p=rust.git

diff --git a/.gitattributes b/.gitattributes
index 7f25bddc06c..a7de7ce8559 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,12 @@
 *.cpp rust
 *.h rust
 *.rs rust
+*.fixed linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge linguist-generated=false
+Cargo.lock linguist-generated=false
+
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.ico binary