diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:40:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:40:23 -0700 |
| commit | 9b4aa47e7d7c00c9a9225e316b520b62ddfb455c (patch) | |
| tree | 014f33673b281ad12ecb0d2f30fa5146a0c32214 /Documentation | |
| parent | f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72 (diff) | |
| parent | f85f7947c38359c05b9df28fafe769fde9341326 (diff) | |
| download | git-9b4aa47e7d7c00c9a9225e316b520b62ddfb455c.tar.gz | |
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
Diffstat (limited to 'Documentation')
| -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 0fa3f89c01..f7334904dc 100644 --- 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 |