From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2021 07:33:44 +0000 (-0800)
Subject: Merge branch 'es/worktree-repair-both-moved'
X-Git-Tag: v2.31.0-rc0~145
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=8664fcb83b8ea51d33f0ba4b1183eaf5c8b5c327

Merge branch 'es/worktree-repair-both-moved'

"git worktree repair" learned to deal with the case where both the
repository and the worktree moved.

* es/worktree-repair-both-moved:
  worktree: teach `repair` to fix multi-directional breakage
---

8664fcb83b8ea51d33f0ba4b1183eaf5c8b5c327