From 972337e8f9424051d90a20e4680eb61037fe5f36 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Wed, 2 Oct 2019 15:22:39 +0200
Subject: [PATCH] Introduce common .gitattributes file

Closes gh-23376
---
 .gitattributes                                               | 5 +++++
 .../org/springframework/http/codec/multipart/.gitattributes  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes
 delete mode 100644 spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..fddb8adb39b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Normalize line endings to LF.
+* text eol=lf
+
+# Ensure that line endings for multipart files in spring-web are not modified.
+*.multipart -text
diff --git a/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes b/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes
deleted file mode 100644
index 3a5e514d9bf..00000000000
--- a/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.multipart     -text