diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:19:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:19:38 -0800 |
| commit | 53d149c54bdedd4cf490943a5478a7826c2379c9 (patch) | |
| tree | 19dbbebd423d35dde5ee77dddbf567e352d2c969 /Documentation/config.txt | |
| parent | Merge branch 'gp/reset-q' (diff) | |
| parent | clean: require -f to do damage by default (diff) | |
| download | tgif-53d149c54bdedd4cf490943a5478a7826c2379c9.tar.xz | |
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.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0df004ea26..8d5d200580 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 |