From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:35:42 +0000 (-0700)
Subject: Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint
X-Git-Tag: v1.7.10.1~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d65c2ee88e09462a9fe11e7d739bc19bb8a3780;p=git.git

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
---

5d65c2ee88e09462a9fe11e7d739bc19bb8a3780