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 su...@apache.org on 2012/10/12 06:55:30 UTC

svn commit: r1397437 - /hadoop/common/trunk/.gitattributes

Author: suresh
Date: Fri Oct 12 04:55:30 2012
New Revision: 1397437

URL: http://svn.apache.org/viewvc?rev=1397437&view=rev
Log:
HADOOP-8912. Add .gitattributes file to prevent CRLF and LF mismatches for source and text files. Contributed by Raja Aluri.

Added:
    hadoop/common/trunk/.gitattributes

Added: hadoop/common/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/.gitattributes?rev=1397437&view=auto
==============================================================================
--- hadoop/common/trunk/.gitattributes (added)
+++ hadoop/common/trunk/.gitattributes Fri Oct 12 04:55:30 2012
@@ -0,0 +1,18 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.cs     text diff=csharp
+*.java   text diff=java
+*.html   text diff=html
+*.py     text diff=python
+*.pl     text diff=perl
+*.pm     text diff=perl
+*.css    text
+*.js     text
+*.sql    text
+
+*.sh     text eol=lf
+
+*.bat    text eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln    text merge=union eol=crlf