summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-24 09:34:27 +0100
committerAzul <azul@riseup.net>2016-05-02 08:24:42 -0300
commit96912fcda221b1403654c0770b227bbf13c9ba51 (patch)
tree02659e69320f63155c91044c3de3f9927f034efc /.gitignore
parent6d9bd6b966ec2370b7f8659b0810b03c5d1568aa (diff)
upgrade: add binstubs to git
http://www.scimedsolutions.com/articles/43-the-new-way-binstubs-work The new wisdom is to also use binstubs in production. Also updated .gitignore according to http://railsdiff.org/3.2.22.2/4.2.6 Removed .swp ignore as that is editor specific and should be set per dev system rather than per project.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3aa8fc7..8d49deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
+# 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
# Ignore the default SQLite database.
/db/*.sqlite3
+/db/*.sqlite3-journal
# Ignore all logfiles and tempfiles.
/log/*.log
@@ -12,7 +16,6 @@ bin
/pkg
/*/pkg
/log
-.*.swp
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*