Auto merge of #13061 - ice1k:master, r=Veykril

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index a77342d72447e4f41a218ae3ec928dc9783869ed..cb87b5d01385ad82c7a1658208d0a2605c7f4306 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
-crates/ra_syntax/tests/data/** -text
+* 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