You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/24 03:54:20 UTC

[5/5] git commit: complete .gitattributes file

complete .gitattributes file


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0c07ad8d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0c07ad8d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0c07ad8d

Branch: refs/heads/master
Commit: 0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d
Parents: 30d380e
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 24 11:54:01 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:54:01 2014 +1000

----------------------------------------------------------------------
 .gitattributes                                          | 12 +++++++++++-
 .../get-present-timestamped-snapshot-1.0-SNAPSHOT.jar   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/0c07ad8d/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 6b3097a..ed5a6a7 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

http://git-wip-us.apache.org/repos/asf/archiva/blob/0c07ad8d/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
----------------------------------------------------------------------
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 0bf1784..df51edd 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