diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-26 12:05:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-26 12:05:57 -0700 |
commit | b8132342e9fed8470037b0e31f60f668bace0725 (patch) | |
tree | 78963febd7d4ccf5c812073b53d3d1b8256a771e /Documentation | |
parent | bd30037e65c53112dd84c2712750e152b2f7f854 (diff) | |
parent | a0f4afbe87ddda7902e36350d163dea146166550 (diff) | |
download | git-b8132342e9fed8470037b0e31f60f668bace0725.tar.gz git-b8132342e9fed8470037b0e31f60f668bace0725.tar.xz |
Merge branch 'jc/maint-clean-nested-dir-safety' into maint
* 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.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index be894af39..ae8938b2d 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, |