summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-04-29 13:53:13 -0700
committerelijah <elijah@riseup.net>2015-04-29 13:53:13 -0700
commitc3b133cb6f02003ab934e5008e108f489ace4158 (patch)
treefee607133958bb7fc1e5d5f159908cbb40a387c3
parente99856e5338424b36884e21db1f1399f4753ab3a (diff)
updated .gitignore
-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/*