aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Tzurel <avi@kensodev.com>2012-03-11 12:34:31 +0200
committerAvi Tzurel <avi@kensodev.com>2012-03-11 12:34:31 +0200
commit8de49fe4613ee4362385dd69d984da463d195a7e (patch)
treea6b0dd1a4cf3ecea42e946d40877d21c962ff42e
parent2562404624bc7d314d05842f4e238aa145b5c78f (diff)
downloadrails-8de49fe4613ee4362385dd69d984da463d195a7e.tar.gz
rails-8de49fe4613ee4362385dd69d984da463d195a7e.tar.bz2
rails-8de49fe4613ee4362385dd69d984da463d195a7e.zip
Squash commits into a single commit
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index aac5e13978..69a95ff214 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -374,6 +374,8 @@ Write your branch name in branch field (is filled with master by default) and pr
Ensure the changesets you introduced are included in the "Commits" tab and that the "Files Changed" incorporate all of your changes.
+If possible, it is encouraged that you squash your commits into a single commit, this makes the pull to master easier, and simplifies the git log for the main repository, so your entire unit of work shows in a single line in the log.
+
Fill in some details about your potential patch including a meaningful title. When finished, press "Send pull request." Rails Core will be notified about your submission.
h4. Get Some Feedback