summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2009-06-08 04:35:38 +0200
committerAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2009-06-08 04:35:38 +0200
commit51fc73782ec3bbaeba5d5880d82d51033c677d33 (patch)
treea312b87952cbafe4c300562878d414e91081c9ba
parent2cc02296a7dd5c3a13f338531009964026adf2cc (diff)
downloadscientific-51fc73782ec3bbaeba5d5880d82d51033c677d33.tar.gz
scientific-51fc73782ec3bbaeba5d5880d82d51033c677d33.tar.xz
Use one top-level .gitignore, use .gitattributes to ignore whitespace errors on *.diff, *.patch
-rw-r--r--.gitattributes3
-rw-r--r--.gitignore5
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..fa542ba
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Disable checks for trailing whitespace for patches, they always trigger warnings
+*.diff whitespace=-trailing-space
+*.patch whitespace=-trailing-space
diff --git a/.gitignore b/.gitignore
index 4eeee9d..798ecd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
.*swp
#*#
.project
-.cache
+
+/.cache
+/metadata/cache
+