From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:40:22 +0000 (-0700)
Subject: Merge branch 'jc/maint-clean-nested-worktree-in-subdir'
X-Git-Tag: v1.7.11-rc0~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e;p=git.git

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

a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e