aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-02-04 21:36:10 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-04 21:36:10 -0200
commitda2d24f7cf4dfb826843cda96b413ca2ba326158 (patch)
tree05493ec510a0cdc86ea8bb2ce46dcb7c73f32445 /railties/guides/source
parent4b2889e771ca7ca1ec6477ab37494db50d366b76 (diff)
downloadrails-da2d24f7cf4dfb826843cda96b413ca2ba326158.tar.gz
rails-da2d24f7cf4dfb826843cda96b413ca2ba326158.tar.bz2
rails-da2d24f7cf4dfb826843cda96b413ca2ba326158.zip
git am is better here
Diffstat (limited to 'railties/guides/source')
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile2
1 files changed, 1 insertions, 1 deletions
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: