Auto merge of #82338 - RalfJung:interp-error-allocs, r=oli-obk

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 0ceb3fe646cca0b882d8c1f2af0216ef9202bba1..ac0a71232efc9457b434da02d25cd232394d3785 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,16 @@
+[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
+
 * text=auto eol=lf
-*.rs diff=rust
+*.cpp rust
+*.h rust
+*.rs rust diff=rust
+*.fixed linguist-language=Rust
+*.mir linguist-language=Rust
+src/etc/installer/gfx/* binary
+*.woff binary
+src/vendor/** -text
+Cargo.lock linguist-generated=false
+
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.ico binary