From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:40:23 +0000 (-0700)
Subject: Merge branch 'jx/clean-interactive'
X-Git-Tag: v1.8.5-rc0~131
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9b4aa47e7d7c00c9a9225e316b520b62ddfb455c?hp=f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72

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 0fa3f89c01..f7334904dc 100644
--- 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