From da2d24f7cf4dfb826843cda96b413ca2ba326158 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 4 Feb 2011 21:36:10 -0200
Subject: git am is better here

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

(limited to 'railties/guides/source')

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 504cd92d90..4f51c0f859 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -231,7 +231,7 @@ git checkout -b testing_branch
 Then you can apply their patch:
 
 <shell>
-git apply their-patch-file.diff
+git am their-patch-file.diff
 </shell>
 
 After applying a patch, test it out! Here are some things to think about:
-- 
cgit v1.2.3