From 7e12aa7424d6db5468be0c78a4409e90d4454859 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <tvd@magiclabs.de>
Date: Tue, 6 Dec 2011 13:26:22 +0100
Subject: Added git --rebase option for pulling rails master

---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties')

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:
-- 
cgit v1.2.3