Permalink
Browse files

Added git --rebase option for pulling rails master

  • Loading branch information...
1 parent bc99447 commit 7e12aa7424d6db5468be0c78a4409e90d4454859 Thomas von Deyen committed Dec 6, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 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:

0 comments on commit 7e12aa7

Please sign in to comment.