diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-13 23:29:30 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-13 23:29:30 +0530 |
| commit | 800c70a8f9e6264e72019b1d8e18bddfa48f1373 (patch) | |
| tree | f8d91928d5313a93248c0485a7c04e53f92bf856 /railties/guides/source/contributing_to_ruby_on_rails.textile | |
| parent | cb7d19b66badfbd1846c195913419c331701074e (diff) | |
| parent | a9f688648cf91b3424710c185b0f17982734d4b6 (diff) | |
| download | rails-800c70a8f9e6264e72019b1d8e18bddfa48f1373.tar.gz rails-800c70a8f9e6264e72019b1d8e18bddfa48f1373.tar.bz2 rails-800c70a8f9e6264e72019b1d8e18bddfa48f1373.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 2 |
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 e082fd2941..df8b16eb9e 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: |