Merge branch 'es/worktree-repair'
commiteb7460fd312511941d64007b5dfc4799a20a8d18
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2020 20:53:07 +0000 (9 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2020 20:53:07 +0000 (9 13:53 -0700)
tree53391a8da272c0fb179597bfb552b13c8afe753f
parent1aadb47aad7f4648a1de1e2de84cbcf235eeff59
parent59d876ccd688ae0fe761b571afe77a7c8317eb88
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
builtin/worktree.c