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

diff --git a/.gitattributes b/.gitattributes
index b223c8ac5fb..a7de7ce8559 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,4 +8,8 @@
 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