diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:12 -0700 |
| commit | 4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1 (patch) | |
| tree | de1b32781f7d0781f5999188d3fb07f989fd1345 | |
| parent | 113bc160941c4bcc9211d32f17098ab5a2428fa4 (diff) | |
| parent | bcd57cb9e1583fe5174112422caba0397f7ae5f6 (diff) | |
| download | git-4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1.tar.gz | |
Merge branch 'mr/doc-clean-f-f' into maint
Documentation update.
* mr/doc-clean-f-f:
Documentation/git-clean.txt: document that -f may need to be given twice
| -rw-r--r-- | Documentation/git-clean.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 94b6d19cf2..641681f61a 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -34,8 +34,12 @@ OPTIONS -f:: --force:: If the Git configuration variable clean.requireForce is not set - to false, 'git clean' will refuse to run unless given -f, -n or - -i. + to false, 'git clean' will refuse to delete files or directories + unless given -f, -n or -i. Git will refuse to delete directories + with .git sub directory or file unless a second -f + is given. This affects also git submodules where the storage area + of the removed submodule under .git/modules/ is not removed until + -f is given twice. -i:: --interactive:: |