Auto merge of #13814 - Veykril:layout, r=Veykril

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index bb3cd61512dcde06121e5963e09833ee4c1e2b18..cb87b5d01385ad82c7a1658208d0a2605c7f4306 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
-crates/ra_syntax/test_data/** -text eof=LF
+* text=auto eol=lf
+
+# git grep shouldn't match entries in this benchmark data
+bench_data/** binary
+
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.jpg binary
+*.ico binary