From 6856ca39937205d06a675a8855510d1fa0b6f683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Mon, 3 Jun 2013 11:58:35 +0200
Subject: [PATCH 1/2] Added a gitattribute file to let git deal with line
 ending issues

---
 .gitattributes | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..e3eee740938
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,21 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text
+*.sql text
+*.htm text
+*.html text
+*.js text
+*.css text
+*.lang text
+*.txt text
+*.md text
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary

From 39e467afbced4e4a9e83129f963b8004da2d3fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 4 Jun 2013 12:32:36 +0200
Subject: [PATCH 2/2] Force git to use LF line endings for PHP files

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index e3eee740938..73e27e445d3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 
 # Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
-*.php text
+*.php text eol=lf
 *.sql text
 *.htm text
 *.html text