summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-16 16:43:10 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-16 16:43:10 +0000
commit41d958f11feba8be0c9375a4c424e51fd83fa20e (patch)
tree04975a762832c06cf0cd10a5c26730cc7373f2a6
parent1a02d681fa1de7c2daed2ecc951f4c9bf1c13976 (diff)
Ignore .orig and .rej
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8c94886e7..f5a3e0212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
dataobject.ini
*~
*.bak
+*.orig
+*.rej