Make merge-recursive honor diff.renamelimit

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 918d8ee720a573f91ec6efa654da5c2cdc05d7b0..734928bf96c35fbe3f66c6693415e0a0d05f9412 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -35,7 +35,7 @@ working tree.
 OPTIONS
 -------
 -q::
-       Quiet, supress feedback messages.
+       Quiet, suppress feedback messages.
 
 -f::
        Proceed even if the index or the working tree differs
@@ -62,9 +62,9 @@ OPTIONS
        configuration variable.
 
 -l::
-       Create the new branch's ref log.  This activates recording of
-       all changes to made the branch ref, enabling use of date
-       based sha1 expressions such as "<branchname>@{yesterday}".
+       Create the new branch's reflog.  This activates recording of
+       all changes made to the branch ref, enabling use of date
+       based sha1 expressions such as "<branchname>@\{yesterday}".
 
 -m::
        If you have local modifications to one or more files that
@@ -215,4 +215,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-