You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by ll...@apache.org on 2013/10/12 06:58:24 UTC

svn commit: r1531502 - /hadoop/common/branches/branch-2/.gitattributes

Author: llu
Date: Sat Oct 12 04:58:24 2013
New Revision: 1531502

URL: http://svn.apache.org/r1531502
Log:
Workaround git eol hell

Modified:
    hadoop/common/branches/branch-2/.gitattributes

Modified: hadoop/common/branches/branch-2/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/.gitattributes?rev=1531502&r1=1531501&r2=1531502&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/.gitattributes (original)
+++ hadoop/common/branches/branch-2/.gitattributes Sat Oct 12 04:58:24 2013
@@ -13,7 +13,8 @@
 
 *.sh     text eol=lf
 
-*.bat    text eol=crlf
-*.cmd    text eol=crlf
-*.csproj text merge=union eol=crlf
-*.sln    text merge=union eol=crlf
+*.bat    binary
+*.cmd    binary
+*.vcxproj binary
+*.csproj binary
+*.sln    binary