From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Mar 2015 05:56:12 +0000 (-0700)
Subject: Merge branch 'mr/doc-clean-f-f' into maint
X-Git-Tag: v2.3.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1?ds=inline;hp=-c

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

4b23b5d1afbc7fcd8bc744523f4c3ff06dbe25d1
diff --combined Documentation/git-clean.txt
index 94b6d19cf2,719f076b99..641681f61a
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@@ -34,8 -34,12 +34,12 @@@ OPTION
  -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::
@@@ -98,7 -102,7 +102,7 @@@ clean:
  filter by pattern::
  
     This shows the files and directories to be deleted and issues an
 -   "Input ignore patterns>>" prompt. You can input space-seperated
 +   "Input ignore patterns>>" prompt. You can input space-separated
     patterns to exclude files and directories from deletion.
     E.g. "*.c *.h" will excludes files end with ".c" and ".h" from
     deletion. When you are satisfied with the filtered result, press