Merge branch 'jc/clean-config'

* jc/clean-config:
  clean: require -f to do damage by default

diff --cc Documentation/config.txt
index 0df004ea261d6862db0a9b528ec7f2c11bdd5b65,aeb7961adefeb098f4a468bb560dcc95be9abd0a..8d5d2005806289b7da9290fd0c40f12016d5ef53
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -338,15 -337,9 +338,15 @@@ branch.<name>.merge:
        branch.<name>.merge to the desired branch, and use the special setting
        `.` (a period) for branch.<name>.remote.
  
 +branch.<name>.mergeoptions::
 +      Sets default options for merging into branch <name>. The syntax and
 +      supported options are equal to that of gitlink:git-merge[1], but
 +      option values containing whitespace characters are currently not
 +      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

diff --cc t/t7300-clean.sh
Simple merge