diff --git a/.gitattributes b/.gitattributes
index 1e01e0484633cf0dfba004c319f03cfa513d1699..a844bf228342edaadee3d4a4a2e15acb87ff3008 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
 # Enable style checks on source files
 *.h   hooks.style=uncrustify
 *.cpp hooks.style=uncrustify