Auto merge of #107843 - bjorn3:sync_cg_clif-2023-02-09, r=bjorn3

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index cb87b5d01385ad82c7a1658208d0a2605c7f4306..51a670b5fbefdaf7904f1d304ea482b0543bc9a9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,18 @@
-* text=auto eol=lf
+[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-# git grep shouldn't match entries in this benchmark data
-bench_data/** binary
+* text=auto eol=lf
+*.cpp rust
+*.h rust
+*.rs rust diff=rust
+*.fixed linguist-language=Rust
+*.mir linguist-language=Rust
+src/etc/installer/gfx/* binary
+src/vendor/** -text
+Cargo.lock linguist-generated=false
+config.toml.example linguist-language=TOML
 
-# Older git versions try to fix line endings on images, this prevents it.
+# Older git versions try to fix line endings on images and fonts, this prevents it.
 *.png binary
-*.jpg binary
 *.ico binary
+*.woff binary
+*.woff2 binary