git am is better here

spastorino · spastorino · commit da2d24f7cf4d · 2011-02-04T21:36:10.000-02:00
diff --git a/activesupport/README.rdoc b/activesupport/README.rdoc
@@ -1,4 +1,5 @@
 = Active Support -- Utility classes and Ruby extensions from Rails
+fasdf
 
 Active Support is a collection of utility classes and standard library
 extensions that were found useful for the Rails framework. These additions
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`= Active Support -- Utility classes and Ruby extensions from Rails`
	`2`	`+fasdf`
`2`	`3`
`3`	`4`	`Active Support is a collection of utility classes and standard library`
`4`	`5`	`extensions that were found useful for the Rails framework. These additions`