Merge branch 'nd/worktree-prune'
commitca923f72653f5bfc61933ee334ca5fe34d4fe5f0
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2018 23:25:45 +0000 (10 08:25 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2018 23:25:45 +0000 (10 08:25 +0900)
tree2e0439f6b79469bc996b273270891e0cc0b332e6
parenta5bbc29994b22ab0b57c4dc9568a261d32476e94
parent327864aaf76d000ee5d7722b9b9611ed7a2708f5
Merge branch 'nd/worktree-prune'

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
builtin/worktree.c