Permalink
Browse files

Small typo in Backporting instructions.

  • Loading branch information...
1 parent a4726d3 commit 84213613c3937e14f5be35d0051817f70f332977 @chancancode chancancode committed Jun 21, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 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:

0 comments on commit 8421361

Please sign in to comment.