Added git --rebase option for pulling rails master

7e12aa74 · Thomas von Deyen · bc994470 · 7e12aa74
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

railties/guides/source/contributing_to_ruby_on_rails.textile railties/guides/source/contributing_to_ruby_on_rails.textile +1 -1

未找到文件。
--- 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: