diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-06 23:05:43 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-06 23:05:43 +0530 |
| commit | 7eb596cddd75b379ca2ca25955b0bd2af77a89bc (patch) | |
| tree | fe4dac360edc71ec5e8f0487a113b59f139505fd /railties/guides/source/contributing_to_ruby_on_rails.textile | |
| parent | 9be2353fac89729b839df3d0538b607f3fc1aa87 (diff) | |
| parent | 89647a305f882cde0e87b0136ad9a1b6d3bd4fbd (diff) | |
| download | rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.tar.gz rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.tar.bz2 rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.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, 1 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index 37ead2bff2..92cb0774de 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -336,7 +336,7 @@ It’s pretty likely that other changes to master have happened while you were w <shell> $ git checkout master -$ git pull +$ git pull --rebase </shell> Now reapply your patch on top of the latest changes: |