Optionally ignore ruby env normalisation files, with comments

diff --git a/Rails.gitignore b/Rails.gitignore
index 2c74f70fef2b1ac173cee4f825fd390856c306cb..2debe997328a28da75a12eb705e497d91c7b7e25 100644 (file)
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -3,9 +3,6 @@
 .sass-cache
 capybara-*.html
 .rspec
-.rvmrc
-/.bundle
-/vendor/bundle
 /log
 /tmp
 /db/*.sqlite3
@@ -16,3 +13,15 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should be checked in to normalise the environment:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

diff --git a/Ruby.gitignore b/Ruby.gitignore
index 560d1a6a30b0ecfad033f41dad5656ac05001bf9..a0914d3627f38b0675529dd9759e2afa7493fc2b 100644 (file)
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -1,10 +1,8 @@
 *.gem
 *.rbc
-.bundle
 .config
 coverage
 InstalledFiles
-lib/bundler/man
 pkg
 rdoc
 spec/reports
@@ -16,3 +14,16 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+## Environment normalisation:
+.bundle
+lib/bundler/man
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc