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
git-mirror · Sep 17, 2013 · 9b4aa47 · 9b4aa47
2 parents f2ded0f + f85f794
commit 9b4aa47
Showing 1 changed file with 2 additions and 2 deletions.
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