aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2011-10-08 08:04:05 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-10-08 08:04:05 -0700
commit1851791803e58dfa19dfe1cb686cf5870e655b27 (patch)
treeaaa411ef6aaf1e0be2fa5ada9744b66d7e149f48 /railties
parent96e1dc3440e055e2b1403b0cecaab4f778c13d30 (diff)
downloadrails-1851791803e58dfa19dfe1cb686cf5870e655b27.tar.gz
rails-1851791803e58dfa19dfe1cb686cf5870e655b27.tar.bz2
rails-1851791803e58dfa19dfe1cb686cf5870e655b27.zip
Add comments to our generated .gitignore, including a note about when to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/gitignore20
1 files changed, 15 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 923b697662..eb3489a986 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -1,5 +1,15 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/
-.sass-cache/
+# 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
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp