From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Sep 2020 20:53:07 +0000 (-0700)
Subject: Merge branch 'es/worktree-repair'
X-Git-Tag: v2.29.0-rc0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb7460fd312511941d64007b5dfc4799a20a8d18;p=thirdparty%2Fgit.git

Merge branch 'es/worktree-repair'

"git worktree" gained a "repair" subcommand to help users recover
after moving the worktrees or repository manually without telling
Git.  Also, "git init --separate-git-dir" no longer corrupts
administrative data related to linked worktrees.

* es/worktree-repair:
  init: make --separate-git-dir work from within linked worktree
  init: teach --separate-git-dir to repair linked worktrees
  worktree: teach "repair" to fix outgoing links to worktrees
  worktree: teach "repair" to fix worktree back-links to main worktree
  worktree: add skeleton "repair" command
---

eb7460fd312511941d64007b5dfc4799a20a8d18