From b7c00a889a607add72823aa20ccf4874a585a8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= <tboegi@web.de>
Date: Sun, 10 Jan 2016 18:31:49 +0100
Subject: [PATCH] .gitattributes: EOL=LF overrides auto

The line
* text=auto eol=lf
in .gitattributes does not work as expected:
setting eol=lf overrides text=auto, and works as
* eol=lf
or
* text eol=lf

This is not what is intended, as binary files like *.gz go through
a CRLF -> LF conversion at commit time.

Use
* crlf=auto
instead (which is even understood by older Git versions, which are still in use)
---
 .gitattributes | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 5eee84cce..2a18bd183 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,15 @@
-* text=auto eol=lf
+#Default, normalize CRLF into LF in non-binary files
+# Files identified as binary by Git are not changed
+* crlf=auto
 
 # special files
+*.sh crlf=input
+*.py crlf=input
+
 *.bat text eol=crlf
+
+*.der binary
+*.gz binary
 *.jpeg binary
 *.jpg binary
 *.png binary