]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/worktree-repair-both-moved'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2021 07:33:44 +0000 (23:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2021 07:33:44 +0000 (23:33 -0800)
"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


Trivial merge