From 0ac2f7cb820bf31e15e174d4061a8792686e629e Mon Sep 17 00:00:00 2001
From: Carl Suster <code@contraflo.ws>
Date: Sun, 10 Nov 2013 21:12:01 +1100
Subject: [PATCH 1/3] Optionally ignore ruby env normalisation files, with
 comments

---
 Rails.gitignore | 15 ++++++++++++---
 Ruby.gitignore  | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Rails.gitignore b/Rails.gitignore
index 2c74f70f..2debe997 100644
--- 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 560d1a6a..a0914d36 100644
--- 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

From efd3490a54ae595bc9fa0444922a4b3c1b83a153 Mon Sep 17 00:00:00 2001
From: Carl Suster <code@contraflo.ws>
Date: Sun, 10 Nov 2013 21:13:54 +1100
Subject: [PATCH 2/3] Tighten some ruby ignore patterns

---
 Ruby.gitignore | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Ruby.gitignore b/Ruby.gitignore
index a0914d36..b20c5ce6 100644
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -3,21 +3,21 @@
 .config
 coverage
 InstalledFiles
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/pkg/
+/spec/reports
+/test/tmp
+/test/version_tmp
+/tmp/
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Documentation cache and generated files:
+/.yardoc
+/_yardoc
+/doc/
+/rdoc
 
 ## Environment normalisation:
-.bundle
-lib/bundler/man
+/.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:

From 669668fb14bebf2231b7bbd531c76cd52ba9d29d Mon Sep 17 00:00:00 2001
From: Carl Suster <code@contraflo.ws>
Date: Sun, 10 Nov 2013 21:39:33 +1100
Subject: [PATCH 3/3] Join comments in rails template

---
 Rails.gitignore | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Rails.gitignore b/Rails.gitignore
index 2debe997..b4be5c7b 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -18,10 +18,8 @@ config/initializers/secret_token.rb
 /.bundle
 /vendor/bundle
 
-# these should be checked in to normalise the environment:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+# these should all 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