From 1dd6522903038ddeb20deb5a447a9d79c62cd2c9 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Fri, 12 Oct 2012 04:55:30 +0000 Subject: [PATCH] HADOOP-8912. Add .gitattributes file to prevent CRLF and LF mismatches for source and text files. Contributed by Raja Aluri. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1397437 13f79535-47bb-0310-9956-ffa450edef68 --- .gitattributes | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..851d236df0 --- /dev/null +++ b/.gitattributes @@ -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