Merge branch 'jk/still-interesting' into maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6cb083aae58018084c8da689bf2bfe5ccc136de5..ccd499867b64d0609df66196f833fff173dd60da 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -432,8 +432,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[]