Merge branch 'jx/clean-interactive'

Finishing touches to update the document to adjust to a new option
"git clean" learned recently.

* jx/clean-interactive:
documentation: clarify notes for clean.requireForce

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0fa3f89c012ebe78ca87a23c79e572a22e4f3338..f7334904dc58c85da024827c8a0d037fe515e1c1 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -789,8 +789,8 @@ browser.<tool>.path::
        working repository in gitweb (see linkgit:git-instaweb[1]).
 
 clean.requireForce::
-       A boolean to make git-clean do nothing unless given -f
-       or -n.   Defaults to true.
+       A boolean to make git-clean do nothing unless given -f,
+       -i or -n.   Defaults to true.
 
 color.branch::
        A boolean to enable/disable color in the output of