diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-13 23:21:41 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-13 23:21:41 +0530 |
| commit | 25cbe00fbc2fd4069d21b78ca5dbbf0cd091f126 (patch) | |
| tree | 77825fcd9aa0187b6854a8eb876126db8beeb7ed /railties/guides/source/contributing_to_ruby_on_rails.textile | |
| parent | bc8b55c5c382b6747e490c04d9d74dc8322bd23c (diff) | |
| download | rails-25cbe00fbc2fd4069d21b78ca5dbbf0cd091f126.tar.gz rails-25cbe00fbc2fd4069d21b78ca5dbbf0cd091f126.tar.bz2 rails-25cbe00fbc2fd4069d21b78ca5dbbf0cd091f126.zip | |
copy-edit contributing guide [ci skip]
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index 69a95ff214..dd993cc3b9 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/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 |