Merge branch 'jc/maint-clean-nested-worktree-in-subdir'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:40:22 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:40:22 +0000 (12:40 -0700)
commita2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e
treeb518f2af6119706ebd6ee8ac771911cec596f11b
parent27ed4350b76deaaacc8b77d1272deec3433cbd38
parentae2f203ef7be7b33ff5ec61646c8662363eccd62
Merge branch 'jc/maint-clean-nested-worktree-in-subdir'

"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