Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:42 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:42 +0000 (10:35 -0700)
commit5d65c2ee88e09462a9fe11e7d739bc19bb8a3780
tree2c473b5896c6e0635940d90fd2b05b1074e33d0a
parent3f231e235fb4b9c4d937a50fa4fbf35f9ed10387
parentae2f203ef7be7b33ff5ec61646c8662363eccd62
Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint

"git clean -d -f" (not "-d -f -f") is supposed to protect nested
working trees of independent git repositories that exist in the
current project working tree from getting removed, but the protection
applied only to such working trees that are at the top-level of the
current project by mistake.

* jc/maint-clean-nested-worktree-in-subdir:
  clean: preserve nested git worktree in subdirectories