diff --git a/.gitattributes b/.gitattributes
index 633021a07c..5152817b12 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,14 @@
-* text=auto eol=lf
+* text=auto
+
 Dockerfile* linguist-language=Dockerfile
 vendor.mod linguist-language=Go-Module
 vendor.sum linguist-language=Go-Checksums
-*.bat text eol=crlf
+
+*.go -text diff=golang
+
+# scripts directory contains shell scripts
+# without extensions, so we need to force
+scripts/** text=auto eol=lf
+
+# shell scripts should always have LF
+*.sh text eol=lf