diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:20 -0800 |
commit | 924459c51604e34d5e392963550111bede4d9f03 (patch) | |
tree | 95558bb1640f75bcf0ed8646ae7886a34b8c72e5 /Documentation | |
parent | Merge branch 'dw/mergetool-vim-window-shuffle' into maint (diff) | |
parent | Documentation/git-clean.txt: don't mention deletion of .git/modules/* (diff) | |
download | tgif-924459c51604e34d5e392963550111bede4d9f03.tar.xz |
Merge branch 'mm/clean-doc-fix' into maint
The documentation for "git clean" has been corrected; it mentioned
that .git/modules/* are removed by giving two "-f", which has never
been the case.
* mm/clean-doc-fix:
Documentation/git-clean.txt: don't mention deletion of .git/modules/*
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-clean.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 641681f61a..51a7e26a8e 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -37,9 +37,7 @@ OPTIONS 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. + is given. -i:: --interactive:: |