Rollup merge of #78771 - tmiasko:inline-consts, r=oli-obk

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 90cf33053c77587326cfec3e29e0f6caa73db1ca..a7de7ce85593c140267bd3bafa3812859d8f259f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,15 @@
+[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
+
 * text=auto eol=lf
-*.rs text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
+*.cpp rust
+*.h rust
+*.rs rust
 *.fixed 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