You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2012/10/26 00:39:09 UTC
git commit: SQOOP-651: adding .gitattributes to prevent CRLF and LF
mismatches for source and text files
Updated Branches:
refs/heads/trunk 695666acd -> d0645bed5
SQOOP-651: adding .gitattributes to prevent CRLF and LF mismatches for source and text files
(Raja Aluri via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/d0645bed
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/d0645bed
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/d0645bed
Branch: refs/heads/trunk
Commit: d0645bed54b28bb7a5a3563e563c941ce241f050
Parents: 695666a
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Thu Oct 25 15:37:53 2012 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Thu Oct 25 15:37:53 2012 -0700
----------------------------------------------------------------------
.gitattributes | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d0645bed/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..bd835f9
--- /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