From 8c2dd7c589cd96f1a78c510ff9e49625a726b1ba Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 10 Aug 2021 11:30:35 +0800
Subject: [PATCH 1/2] Add .gitattributes

See gh-27615
---
 .gitattributes | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..27fc7c29606
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary
\ No newline at end of file

From 497d68acf1c13e6a06640e00ff3237ab23eef9ee Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 28 Oct 2021 13:49:35 +0200
Subject: [PATCH 2/2] Polish "Add .gitattributes"

See gh-27615
---
 .gitattributes | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 27fc7c29606..48ca03426f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,11 @@
-* text=auto eol=lf
+* text eol=lf
 
-*.bat text eol=crlf
-*.jar binary
\ No newline at end of file
+*.groovy        text diff=java
+*.java          text diff=java
+*.kt            text diff=java
+
+*.bat           text eol=crlf
+
+*.gif           binary
+*.jar           binary
+*.jpg           binary