diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000..176a458f94e0e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/test/layout_test.rb b/test/layout_test.rb
index c4711c525e943..c16e47e11ae0f 100644
--- a/test/layout_test.rb
+++ b/test/layout_test.rb
@@ -37,6 +37,7 @@
 
   TOPLEVEL_FILES = %w{
                       .editorconfig
+                      .gitattributes
                       .gitignore
                       .rspec
                       .rubocop.yml