Merge branch 'maint'

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 5aff026eb489a84640ffef6c8deed5b9f89e2b06..e3252d59daa33576c0b00bd5f2daa3a5b50c9b7a 100644 (file)
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -26,7 +26,7 @@ OPTIONS
        Remove untracked directories in addition to untracked files.
 
 -f::
-       If the git configuration specifies clean.forceRequire as true,
+       If the git configuration specifies clean.requireForce as true,
        git-clean will refuse to run unless given -f or -n.
 
 -n::