diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:11 -0700 |
| commit | 4835409be100b6e7ce709874f3fd135986d3d92f (patch) | |
| tree | a40cbf30dce93016c99adf44177a26eb4b1cbc35 | |
| parent | 92741d83c06b4cd0a15f43e23e4456604096cb0c (diff) | |
| parent | 8b3aa36f5a7a0c923bc4a28ff19caae78644ae08 (diff) | |
| download | git-4835409be100b6e7ce709874f3fd135986d3d92f.tar.gz | |
Merge branch 'ps/rewritten-is-per-worktree-doc'
Doc update.
* ps/rewritten-is-per-worktree-doc:
doc/git-worktree: mention "refs/rewritten" as per-worktree refs
| -rw-r--r-- | Documentation/git-worktree.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index a4fbf5e838..93d76f5d66 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -286,7 +286,8 @@ rules and how to access refs of one worktree from another. In general, all pseudo refs are per-worktree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, -however: refs inside `refs/bisect` and `refs/worktree` are not shared. +however: refs inside `refs/bisect`, `refs/worktree` and `refs/rewritten` are +not shared. Refs that are per-worktree can still be accessed from another worktree via two special paths, `main-worktree` and `worktrees`. The former gives @@ -363,8 +364,8 @@ linked worktree `git rev-parse --git-path HEAD` returns `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, -since refs are shared across all worktrees, except `refs/bisect` and -`refs/worktree`. +since refs are shared across all worktrees, except `refs/bisect`, +`refs/worktree` and `refs/rewritten`. See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to |