diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
| commit | 8664fcb83b8ea51d33f0ba4b1183eaf5c8b5c327 (patch) | |
| tree | ae1b61ee688d2c41efa2825cdc91b92b85e0cb51 /Documentation | |
| parent | Merge branch 'en/merge-ort-recursive' (diff) | |
| parent | worktree: teach `repair` to fix multi-directional breakage (diff) | |
| download | tgif-8664fcb83b8ea51d33f0ba4b1183eaf5c8b5c327.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-worktree.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index af06128cc9..02a706c4c0 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -143,6 +143,11 @@ locate it. Running `repair` within the recently-moved working tree will reestablish the connection. If multiple linked working trees are moved, running `repair` from any working tree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths. ++ +If both the main working tree and linked working trees have been moved +manually, then running `repair` in the main working tree and specifying the +new `<path>` of each linked working tree will reestablish all connections +in both directions. unlock:: |