From: Olivier Lamy <olamy@apache.org>
Date: Thu, 24 Apr 2014 01:54:01 +0000 (+1000)
Subject: complete .gitattributes file
X-Git-Tag: archiva-2.1.0~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d;p=archiva.git

complete .gitattributes file
---

diff --git a/.gitattributes b/.gitattributes
index 6b3097ade..ed5a6a78e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-*.jar binary
\ No newline at end of file
+*.jar binary
+
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.java   text diff=java
+*.html   text diff=html
+*.xml    text diff=xml
+*.css    text
+*.js     text
+*.sql    text
\ No newline at end of file
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0bf178413..df51eddb4 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
@@ -1,2 +1,2 @@
-get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
 (proxied 1)
\ No newline at end of file