diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000..976c7c3cc4b3f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# ./mvnw fails on Windows in git bash if -Xmx in that file has a trailing CRLF
+.mvn/jvm.config		text eol=lf
+
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
index 8cf6ad94209da..fb54b397cc9f0 100644
--- a/.mvn/jvm.config
+++ b/.mvn/jvm.config
@@ -2,5 +2,4 @@
 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
 -Dmaven.wagon.http.retryHandler.count=10
 -Dkotlin.environment.keepalive=true
--Xmx5g
-
+-Xmx5g
\ No newline at end of file