Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 9f803813ed27451d773651c9ff76689009646408..25a58f158fc10969d96a07b31634e05431143a84 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,16 +1,24 @@
-#*.c   crlf
-#*.h   crlf
-#*.cs  crlf
-#*.sh  crlf
+# ensure LF endings on all checkouts
+configure.ac   crlf=input
+config.rpath   crlf=input
+configure.host crlf=input
+mkinstalldirs  crlf=input
+*.sh   crlf=input
+*.sources      crlf=input
+.gitattributes crlf=input
+*akefile*      crlf=input
 
-#ChangeLog     crlf
-#*akefile*     crlf
-#*.sources     crlf
+# ensure native line endings on checkout
+*.c    crlf
+*.h    crlf
+*.cs   crlf
+*.il   crlf
 
-# don't do anything to line-endings.  Let CRLFs go into the repo
+# don't do anything to line-endings.  Let CRLFs go into the repo, and CRLF on checkout
 *.bat          -crlf
 *.sln          -crlf
 *.*proj*       -crlf
+*.xml          -crlf
 
 # CRLF Handling
 # -------------