Merge branch 'sp/maint-plug-traverse-commit-list-leak' into sp/fetch-fix

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0df004ea261d6862db0a9b528ec7f2c11bdd5b65..8d5d2005806289b7da9290fd0c40f12016d5ef53 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -345,8 +345,8 @@ branch.<name>.mergeoptions::
        supported.
 
 clean.requireForce::
-       A boolean to make git-clean do nothing unless given -f or -n.  Defaults
-       to false.
+       A boolean to make git-clean do nothing unless given -f
+       or -n.   Defaults to true.
 
 color.branch::
        A boolean to enable/disable color in the output of