From 8de49fe4613ee4362385dd69d984da463d195a7e Mon Sep 17 00:00:00 2001
From: Avi Tzurel <avi@kensodev.com>
Date: Sun, 11 Mar 2012 12:34:31 +0200
Subject: Squash commits into a single commit

---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')

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
-- 
cgit v1.2.3

