From 98b04198c6ea5bc07cca50956809068adf1fea82 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 20:18:37 +0200
Subject: Add .gitattributes file

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

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e036c946
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,49 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+*	text=auto eol=lf
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.[ch]	text diff=cpp
+*.[ch]pp	text diff=cpp
+*.asm	text
+Makefile	text
+*.make	text
+*.mk	text
+*.inc	text
+*.md	text
+*.xml	text
+*.xpm	text -diff -merge
+*.pem	text -diff -merge
+*.cer	text -diff -merge
+*.manifest	text
+*.sh	text
+*.txt	text
+*.html	text diff=html
+*.idl	text
+*.fbp	text
+*.rgs	text
+*.pkgproj	text
+Sources	text
+
+# Declare files that will always have LF line endings on checkout.
+*.desktop	text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln	text eol=crlf
+*.vcproj	text eol=crlf
+*.rc	text eol=crlf
+*.bat	text eol=crlf
+*.cmd	text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png	binary
+*.jpg	binary
+*.pdf	binary
+*.bmp	binary
+*.ico	binary
+*.od[fgpst]	binary
+*.hc	binary
+*.icns	binary
+*.rtf	binary
+*.bz2	binary
+*.pfx	binary
-- 
cgit v1.2.3


From 191075155835172e5596e191cf0679ff9022f0fd Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 21:58:40 +0200
Subject: Fix issues with .gitattributes

 - Revert accidentally converted binary file
---
 .gitattributes | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index e036c946..d8280400 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,29 +1,30 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-*	text=auto eol=lf
+*	text=auto
 
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.[ch]	text diff=cpp
-*.[ch]pp	text diff=cpp
-*.asm	text
-Makefile	text
-*.make	text
-*.mk	text
-*.inc	text
-*.md	text
-*.xml	text
-*.xpm	text -diff -merge
-*.pem	text -diff -merge
-*.cer	text -diff -merge
-*.manifest	text
-*.sh	text
-*.txt	text
-*.html	text diff=html
-*.idl	text
-*.fbp	text
-*.rgs	text
-*.pkgproj	text
-Sources	text
+# Explicitly declare text files that could be normalized and converted
+# to native line endings on checkout. However, as per the policy they're
+# supposed to have LF endings on all platforms.
+*.[ch]	text diff=cpp eol=lf
+*.[ch]pp	text diff=cpp eol=lf
+*.asm	text eol=lf
+Makefile	text eol=lf
+*.make	text eol=lf
+*.mk	text eol=lf
+*.inc	text eol=lf
+*.md	text eol=lf
+*.xml	text eol=lf
+*.xpm	text -diff -merge eol=lf
+*.pem	text -diff -merge eol=lf
+*.cer	text -diff -merge eol=lf
+*.manifest	text eol=lf
+*.sh	text eol=lf
+*.txt	text eol=lf
+*.html	text diff=html eol=lf
+*.idl	text eol=lf
+*.fbp	text eol=lf
+*.rgs	text eol=lf
+*.pkgproj	text eol=lf
+Sources	text eol=lf
 
 # Declare files that will always have LF line endings on checkout.
 *.desktop	text eol=lf
-- 
cgit v1.2.3