summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore10
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index d2c630c..7866b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-# git config --global core.excludesfile ~/.gitignore_global
-
# Ignore bundler config
/.bundle
bin
@@ -24,6 +18,10 @@ test/dummy/log/*
test/dummy/tmp/*
*.pyc
+# ignore the disabled customization directories that
+# i keep around for testing purposes.
+config/customization.*
+
# ignore all deploy specific configuration
config/couchdb.yml
public/assets/*