Auto merge of #69374 - Dylan-DPC:rollup-x7mjd5z, r=Dylan-DPC

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 7f25bddc06cfefdbf78a4c681b3dc3ec79731a0b..a7de7ce85593c140267bd3bafa3812859d8f259f 100644 (file)
--- 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