summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2014-04-24 11:54:01 +1000
committerOlivier Lamy <olamy@apache.org>2014-04-24 11:54:01 +1000
commit0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d (patch)
treee735090d2a0056c729a351a4684aeac7c734450e
parent30d380e6b03aa1016c4ec0ba2df79336cc5e7c81 (diff)
downloadarchiva-0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d.tar.gz
archiva-0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d.zip
complete .gitattributes file
-rw-r--r--.gitattributes12
-rw-r--r--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.jar2
2 files changed, 12 insertions, 2 deletions
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