aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source
diff options
context:
space:
mode:
authorMike Gunderloy <MikeG1@larkfarm.com>2009-09-11 10:04:09 -0500
committerMike Gunderloy <MikeG1@larkfarm.com>2009-09-11 10:04:09 -0500
commitd879cb8710ddd6c4c036af03aae8e5dc53e5d51f (patch)
tree84293553c573f1043e5d0a53d39fe359fa331445 /railties/guides/source
parentfb74a1b3ddb9750290442377610acd2d6f0906e3 (diff)
downloadrails-d879cb8710ddd6c4c036af03aae8e5dc53e5d51f.tar.gz
rails-d879cb8710ddd6c4c036af03aae8e5dc53e5d51f.tar.bz2
rails-d879cb8710ddd6c4c036af03aae8e5dc53e5d51f.zip
Use 'git apply' to apply patches
Diffstat (limited to 'railties/guides/source')
-rw-r--r--railties/guides/source/contributing_to_rails.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_rails.textile b/railties/guides/source/contributing_to_rails.textile
index b20b7d3994..2b5335f7c3 100644
--- a/railties/guides/source/contributing_to_rails.textile
+++ b/railties/guides/source/contributing_to_rails.textile
@@ -131,7 +131,7 @@ git checkout -b testing_branch
Then you can apply their patch:
<shell>
-git am < their-patch-file.diff
+git apply their-patch-file.diff
</shell>
After applying a patch, test it out! Here are some things to think about: