diff --git a/.gitattributes b/.gitattributes
index 022b841..26d5621 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,9 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# These are explicitly windows files and should use crlf
-*.bat           text eol=crlf
+# Documentation: https://www.git-scm.com/docs/gitattributes
+
+# Set default behavior to automatically normalize line endings.
+* text=auto eol=lf
+
+# Force batch scripts to always use CRLF line endings so that if a repo is accessed
+# in Windows via a file share from Linux, the scripts will work.
+*.cmd text eol=crlf
+*.bat text eol=crlf