diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:26 -0800 |
| commit | 34e4e05b5169ad0b94176aef188e7f704a75bd93 (patch) | |
| tree | 83a1904f2ffa135d0e96266826e5304c0136f2e5 /Documentation/git-clean.txt | |
| parent | 74c91d1f7a1e7848a3614c1c5031755bfa5e80e1 (diff) | |
| parent | bcd57cb9e1583fe5174112422caba0397f7ae5f6 (diff) | |
| download | git-34e4e05b5169ad0b94176aef188e7f704a75bd93.tar.gz | |
Merge branch 'mr/doc-clean-f-f'
Documentation update.
* mr/doc-clean-f-f:
Documentation/git-clean.txt: document that -f may need to be given twice
Diffstat (limited to 'Documentation/git-clean.txt')
| -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:: |