verify_lock(): report errors via a strbuf

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f77df9806e144a2929afe8420eb988746b95acfb..b7c3afeb3a0ce871d426de6912a6a875f37620fa 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -436,8 +436,8 @@ endif::git-format-patch[]
 -O<orderfile>::
        Output the patch in the order specified in the
        <orderfile>, which has one shell glob pattern per line.
-       This overrides the `diff.orderfile` configuration variable
-       (see linkgit:git-config[1]).  To cancel `diff.orderfile`,
+       This overrides the `diff.orderFile` configuration variable
+       (see linkgit:git-config[1]).  To cancel `diff.orderFile`,
        use `-O/dev/null`.
 
 ifndef::git-format-patch[]