merge-recursive --renormalize

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 335c885bb7b9fbf373400f44bcdca82f6b3e9958..a81cb6c28050e83778f11f2957d3489f50fa6004 100644 (file)
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -33,8 +33,8 @@ OPTIONS
 
 -f::
 --force::
-       If the git configuration specifies clean.requireForce as true,
-       'git clean' will refuse to run unless given -f or -n.
+       If the git configuration variable clean.requireForce is not set
+       to false, 'git clean' will refuse to run unless given -f or -n.
 
 -n::
 --dry-run::