Merge branch 'lm/squelch-bg-progress'

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 9489664cfa6c15725a5153ed3856b70061c6787f..d9ed6a1a4ea6dc0068144eac4c5e0f5ef33a04cb 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -242,7 +242,7 @@ has no effect when `--index` or `--cached` is in use.
 Configuration
 -------------
 
-apply.ignorewhitespace::
+apply.ignoreWhitespace::
        Set to 'change' if you want changes in whitespace to be ignored by default.
        Set to one of: no, none, never, false if you want changes in
        whitespace to be significant.