Permalink
Browse files

copy-edit contributing guide [ci skip]

  • Loading branch information...
1 parent bc8b55c commit 25cbe00fbc2fd4069d21b78ca5dbbf0cd091f126 @vijaydev vijaydev committed Mar 13, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 railties/guides/source/contributing_to_ruby_on_rails.textile
View
4 railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -332,6 +332,8 @@ When you're happy with the code on your computer, you need to commit the changes
$ git commit -a -m "Here is a commit message on what I changed in this commit"
</shell>
+TIP. Please squash your commits into a single commit when appropriate. This simplifies future cherry picks, and also keeps the git log clean.
+
h4. Update master
It’s pretty likely that other changes to master have happened while you were working. Go get them:
@@ -374,8 +376,6 @@ 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

0 comments on commit 25cbe00

Please sign in to comment.