Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity-live] / .gitignore

diff --git a/.gitignore b/.gitignore
index 42f2b24ae1e026d9f320403cc576219156ff5d46..b231fb40c44abebe580ef48caa205b4682389410 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,12 @@
+*~
+*.swp

 database.yml
 database.yml

-development.log
-production.log
-server.log
-test.log

 tmp
 public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update
 tmp
 public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update

-public/pictures
+public/pictures/*

 public/skin_pictures
 public/skin_pictures

-public/pictures

 help
 help

-public/pictures/0000
+log/*
+*~