Merge branch 'nd/worktree-prune' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:49 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:49 +0000 (14:22 -0700)
The way "git worktree prune" worked internally has been simplified,
by assuming how "git worktree move" moves an existing worktree to a
different place.

* nd/worktree-prune:
worktree prune: improve prune logic when worktree is moved
worktree: delete dead code
gc.txt: more details about what gc does

1  2 
builtin/worktree.c
Simple merge