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
commita240de730b5bbfa42bddb96ca7ec1cc2324e5d7b (patch)
tree5a0c625178e6e4e45e5461450b7f712631655824
parent11b69531f3a74722d44fc3eb7647acce021f23a5 (diff)
downloadphp-a240de730b5bbfa42bddb96ca7ec1cc2324e5d7b.tar.gz
php-a240de730b5bbfa42bddb96ca7ec1cc2324e5d7b.tar.xz
Use one top-level .gitignore, use .gitattributes to ignore whitespace errors on *.diff, *.patch
-rw-r--r--.gitattributes3
-rw-r--r--.gitignore4
2 files changed, 7 insertions, 0 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 b48acc1..798ecd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
.*swp
#*#
.project
+
+/.cache
+/metadata/cache
+