From 11929ae32d87f620a9d6eeda5c4a9acebf00aad7 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Thu, 25 Oct 2012 15:37:53 -0700 Subject: [PATCH] SQOOP-651: adding .gitattributes to prevent CRLF and LF mismatches for source and text files (Raja Aluri via Jarek Jarcec Cecho) --- .gitattributes | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..bd835f92 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,35 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# 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