aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2011-10-25 13:30:50 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-10-25 13:30:50 -0700
commit139562f241136ca89209ddaffaf10b0b3a599b39 (patch)
tree4f2b000e55d91da73149036097c25b88854b283f /.gitignore
parent057a268d45e8432341bd73ae4c141bb926381f2f (diff)
downloadrails-139562f241136ca89209ddaffaf10b0b3a599b39.tar.gz
rails-139562f241136ca89209ddaffaf10b0b3a599b39.tar.bz2
rails-139562f241136ca89209ddaffaf10b0b3a599b39.zip
Clean up .gitignore and make a note about using global ignores
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore47
1 files changed, 22 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index ab0950d7dd..aa14cee911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,23 @@
-pkg
-.bundle
-Gemfile.lock
+# Don't put *.swp, *.bak, etc here; those belong in a global ~/.gitignore.
+# Check out http://help.github.com/ignore-files/ for how to set that up.
+
debug.log
-doc/rdoc
-activemodel/doc
-activeresource/doc
-activerecord/doc
-activerecord/sqlnet.log
-actionpack/doc
-actionmailer/doc
-activesupport/doc
-activesupport/test/tmp
-activemodel/test/fixtures/fixture_database.sqlite3
-actionpack/test/tmp
-activesupport/test/fixtures/isolation_test
-dist
-railties/test/500.html
-railties/test/fixtures/tmp
-railties/test/initializer/root/log
-railties/doc
-railties/guides/output
-railties/tmp
-.rvmrc
-.rbenv-version
-RDOC_MAIN.rdoc
+/.bundle
+/.rbenv-version
+/.rvmrc
+/Gemfile.lock
+/pkg
+/dist
+/doc/rdoc
+/*/doc
+/*/test/tmp
+/activerecord/sqlnet.log
+/activemodel/test/fixtures/fixture_database.sqlite3
+/activesupport/test/fixtures/isolation_test
+/railties/test/500.html
+/railties/test/fixtures/tmp
+/railties/test/initializer/root/log
+/railties/doc
+/railties/guides/output
+/railties/tmp
+/RDOC_MAIN.rdoc