Rollup merge of #57827 - parched:ignore, r=nikomatsakis

[rust.git] / .gitattributes

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