aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-16 12:40:22 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-16 12:40:22 -0700
commita2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e (patch)
treeb518f2af6119706ebd6ee8ac771911cec596f11b /diff.h
parent27ed4350b76deaaacc8b77d1272deec3433cbd38 (diff)
parentae2f203ef7be7b33ff5ec61646c8662363eccd62 (diff)
downloadgit-a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e.tar.gz
git-a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e.tar.xz
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
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions