mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
4835409be1
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue