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
maint
Junio C Hamano 2015-03-13 22:56:12 -07:00
commit 4b23b5d1af
1 changed files with 6 additions and 2 deletions

View File

@ -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::