summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-06-30 11:32:53 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-06-30 11:32:53 -0400
commit9e95d2b7283e3d49b88cea3a8be2b89ac9f165f9 (patch)
tree18b1512935144903c1c724ee5a5b36ec85a8e7db
parent6050bd37b062f98e2a66b7d77a4781bc0cca598f (diff)
Only track an example database.yml
-rw-r--r--.gitignore4
-rw-r--r--config/database.example.yml (renamed from config/database.yml)0
2 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.*
*~
*#
diff --git a/config/database.yml b/config/database.example.yml
index 51a4dd4..51a4dd4 100644
--- a/config/database.yml
+++ b/config/database.example.yml