summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:13:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:13:13 -0700
commit14683af812ee0b19c416223287c6e330dbdc9ffc (patch)
tree8f6aba92fa7a9e1f088129b1ebc4f6082d4c8d31 /Documentation
parentMerge branch 'jk/maint-merge-msg-fix' (diff)
parentclean: require double -f options to nuke nested git repository and work tree (diff)
downloadtgif-14683af812ee0b19c416223287c6e330dbdc9ffc.tar.xz
Merge branch 'jc/maint-clean-nested-dir-safety'
* jc/maint-clean-nested-dir-safety: clean: require double -f options to nuke nested git repository and work tree
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-clean.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index be894af39f..ae8938b2de 100644
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -27,6 +27,9 @@ OPTIONS
-------
-d::
Remove untracked directories in addition to untracked files.
+ If an untracked directory is managed by a different git
+ repository, it is not removed by default. Use -f option twice
+ if you really want to remove such a directory.
-f::
If the git configuration specifies clean.requireForce as true,