diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-09 13:53:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 13:53:07 -0700 |
| commit | eb7460fd312511941d64007b5dfc4799a20a8d18 (patch) | |
| tree | 53391a8da272c0fb179597bfb552b13c8afe753f /sha1-file.c | |
| parent | Merge branch 'jk/worktree-check-clean-leakfix' (diff) | |
| parent | init: make --separate-git-dir work from within linked worktree (diff) | |
| download | tgif-eb7460fd312511941d64007b5dfc4799a20a8d18.tar.xz | |
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
Diffstat (limited to 'sha1-file.c')
0 files changed, 0 insertions, 0 deletions