X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitattributes;h=a7de7ce85593c140267bd3bafa3812859d8f259f;hb=2c462a2f776b899d46743b1b44eda976e846e61d;hp=2b4f3d472632a356d67f5a01cdf7daa047a5f002;hpb=61cc23e3e577af740e6ca94cc909b9921bdff5ec;p=rust.git

diff --git a/.gitattributes b/.gitattributes
index 2b4f3d47263..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
+Cargo.lock linguist-generated=false
+
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.ico binary