Merge branch 'jx/clean-interactive'

gitster · gitster · commit 9b4aa47e7d7c · 2013-09-17T11:40:23.000-07:00
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
@@ -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
