summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-08 02:19:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-08 02:19:38 (GMT)
commit53d149c54bdedd4cf490943a5478a7826c2379c9 (patch)
tree19dbbebd423d35dde5ee77dddbf567e352d2c969 /Documentation/config.txt
parentf8b7819be98b2e7fc847639d1aef09ae0167f125 (diff)
parent562ca192f94496611583688beb3725603ce51f89 (diff)
downloadgit-53d149c54bdedd4cf490943a5478a7826c2379c9.zip
git-53d149c54bdedd4cf490943a5478a7826c2379c9.tar.gz
git-53d149c54bdedd4cf490943a5478a7826c2379c9.tar.bz2
Merge branch 'jc/clean-config'
* jc/clean-config: clean: require -f to do damage by default
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0df004e..8d5d200 100644
--- 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