Merge branch 'jc/clean-config'

* jc/clean-config: clean: require -f to do damage by default
2007-11-07 18:19:38 -08:00
parent f8b7819be9 562ca192f9
commit 53d149c54b
4 changed files with 22 additions and 9 deletions
--- 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