aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2012-06-21 02:19:32 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2012-06-21 02:19:32 -0700
commit84213613c3937e14f5be35d0051817f70f332977 (patch)
treee9736018d172a9a114626908b827922424d2f614 /guides/source
parenta4726d380508453d2fe943e22cfa91b3f9df3e09 (diff)
downloadrails-84213613c3937e14f5be35d0051817f70f332977.tar.gz
rails-84213613c3937e14f5be35d0051817f70f332977.tar.bz2
rails-84213613c3937e14f5be35d0051817f70f332977.zip
Small typo in Backporting instructions.
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/contributing_to_ruby_on_rails.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index b52cd6c6b6..1dadce2083 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -474,7 +474,7 @@ h4. Backporting
Changes that are merged into master are intended for the next major release of Rails. Sometimes, it might be beneficial for your changes to propagate back to the maintenance releases for older stable branches. Generally, security fixes and bug fixes are good candidates for a backport, while new features and patches that introduce a change in behavior will not be accepted. When in doubt, it is best to consult a rails team member before backporting your changes to avoid wasted effort.
-For simple fixes, the easiest way to backport your change is to "extract a diff from your changes in master and apply them to the target branch":http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git.
+For simple fixes, the easiest way to backport your changes is to "extract a diff from your changes in master and apply them to the target branch":http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git.
First make sure your changes are the only difference between your current branch and master: