Author: suresh
Date: Fri Oct 12 05:01:41 2012
New Revision: 1397440
URL: http://svn.apache.org/viewvc?rev=1397440&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/branches/branch-1-win/.gitattributes
Modified:
hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
Added: hadoop/common/branches/branch-1-win/.gitattributes
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/.gitattributes?rev=1397440&view=auto
==============================================================================
--- hadoop/common/branches/branch-1-win/.gitattributes (added)
+++ hadoop/common/branches/branch-1-win/.gitattributes Fri Oct 12 05:01:41 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
Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1397440&r1=1397439&r2=1397440&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Fri Oct 12
05:01:41 2012
@@ -154,3 +154,6 @@ Branch-hadoop-1-win - unreleased
HADOOP-8911. CRLF characters in source and text files.
(Raja Aluri via suresh)
+
+ HADOOP-8912. Add .gitattributes file to prevent CRLF and LF mismatches
+ for source and text files. (Raja Aluri via suresh)
