summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9151edf..f73ed63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,12 @@
/config/application.yml
# The rest is from Luke.
+/config/database.yml
/vendor/bundle
/public/assets
-nohup.out
+
# As noted above, you probably want to add the following to your global git config.
+nohup.out
.~lock.*
*~
*#