Merge branch 'kn/git-cd-to-empty' into maint

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 94b6d19cf2a658a9258ee54b141b4eb9b1a6cae3..641681f61ad360fcfd5aa98f81a9e3d49c44c8a7 100644 (file)
--- 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::