Added git --rebase option for pulling rails master

2011-12-06 13:26:22 +01:00 · 2011-12-06 13:26:22 +01:00 · 7e12aa7424
commit 7e12aa7424
parent bc994470c4
1 changed files with 1 additions and 1 deletions
--- 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: