2015-06-29 12:51:18 +00:00
|
|
|
git-worktree(1)
|
|
|
|
===============
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2015-07-20 05:29:18 +00:00
|
|
|
git-worktree - Manage multiple working trees
|
2015-06-29 12:51:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
|
|
|
[verse]
|
2017-11-26 19:43:52 +00:00
|
|
|
'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]
|
2015-10-08 17:01:05 +00:00
|
|
|
'git worktree list' [--porcelain]
|
2016-06-13 12:18:24 +00:00
|
|
|
'git worktree lock' [--reason <string>] <worktree>
|
2018-02-12 09:49:36 +00:00
|
|
|
'git worktree move' <worktree> <new-path>
|
2016-05-22 09:33:53 +00:00
|
|
|
'git worktree prune' [-n] [-v] [--expire <expire>]
|
2018-04-17 18:19:39 +00:00
|
|
|
'git worktree remove' [-f] <worktree>
|
2020-08-31 06:57:58 +00:00
|
|
|
'git worktree repair' [<path>...]
|
2016-06-13 12:18:25 +00:00
|
|
|
'git worktree unlock' <worktree>
|
2015-06-29 12:51:18 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
|
|
|
|
2015-07-20 05:29:18 +00:00
|
|
|
Manage multiple working trees attached to the same repository.
|
2015-06-29 12:51:18 +00:00
|
|
|
|
2015-07-06 17:30:40 +00:00
|
|
|
A git repository can support multiple working trees, allowing you to check
|
2015-07-16 22:09:43 +00:00
|
|
|
out more than one branch at a time. With `git worktree add` a new working
|
2015-07-06 17:30:40 +00:00
|
|
|
tree is associated with the repository. This new working tree is called a
|
2020-08-04 00:55:35 +00:00
|
|
|
"linked working tree" as opposed to the "main working tree" prepared by
|
|
|
|
linkgit:git-init[1] or linkgit:git-clone[1].
|
|
|
|
A repository has one main working tree (if it's not a
|
2018-04-09 07:33:59 +00:00
|
|
|
bare repository) and zero or more linked working trees. When you are done
|
|
|
|
with a linked working tree, remove it with `git worktree remove`.
|
2015-07-06 17:30:40 +00:00
|
|
|
|
2020-09-07 00:02:22 +00:00
|
|
|
In its simplest form, `git worktree add <path>` automatically creates a
|
|
|
|
new branch whose name is the final component of `<path>`, which is
|
|
|
|
convenient if you plan to work on a new topic. For instance, `git
|
|
|
|
worktree add ../hotfix` creates new branch `hotfix` and checks it out at
|
|
|
|
path `../hotfix`. To instead work on an existing branch in a new working
|
|
|
|
tree, use `git worktree add <path> <branch>`. On the other hand, if you
|
|
|
|
just plan to make some experimental changes or do testing without
|
|
|
|
disturbing existing development, it is often convenient to create a
|
|
|
|
'throwaway' working tree not associated with any branch. For instance,
|
|
|
|
`git worktree add -d <path>` creates a new working tree with a detached
|
|
|
|
`HEAD` at the same commit as the current branch.
|
|
|
|
|
2018-04-09 07:33:59 +00:00
|
|
|
If a working tree is deleted without using `git worktree remove`, then
|
|
|
|
its associated administrative files, which reside in the repository
|
|
|
|
(see "DETAILS" below), will eventually be removed automatically (see
|
2015-07-24 04:00:52 +00:00
|
|
|
`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run
|
2015-07-06 17:30:40 +00:00
|
|
|
`git worktree prune` in the main or any linked working tree to
|
2015-07-06 17:30:42 +00:00
|
|
|
clean up any stale administrative files.
|
2015-07-06 17:30:40 +00:00
|
|
|
|
2015-07-06 17:30:43 +00:00
|
|
|
If a linked working tree is stored on a portable device or network share
|
|
|
|
which is not always mounted, you can prevent its administrative files from
|
2016-06-13 12:18:24 +00:00
|
|
|
being pruned by issuing the `git worktree lock` command, optionally
|
|
|
|
specifying `--reason` to explain why the working tree is locked.
|
2015-07-06 17:30:40 +00:00
|
|
|
|
2015-06-29 12:51:18 +00:00
|
|
|
COMMANDS
|
|
|
|
--------
|
2017-11-26 19:43:52 +00:00
|
|
|
add <path> [<commit-ish>]::
|
2015-07-06 17:30:50 +00:00
|
|
|
|
2017-11-26 19:43:52 +00:00
|
|
|
Create `<path>` and checkout `<commit-ish>` into it. The new working directory
|
2015-07-06 17:30:50 +00:00
|
|
|
is linked to the current repository, sharing everything except working
|
2020-08-04 00:55:34 +00:00
|
|
|
directory specific files such as `HEAD`, `index`, etc. As a convenience,
|
|
|
|
`<commit-ish>` may be a bare "`-`", which is synonymous with `@{-1}`.
|
2015-07-06 17:30:59 +00:00
|
|
|
+
|
2020-08-04 00:55:31 +00:00
|
|
|
If `<commit-ish>` is a branch name (call it `<branch>`) and is not found,
|
2017-11-26 19:43:54 +00:00
|
|
|
and neither `-b` nor `-B` nor `--detach` are used, but there does
|
|
|
|
exist a tracking branch in exactly one remote (call it `<remote>`)
|
2018-02-16 20:44:51 +00:00
|
|
|
with a matching name, treat as equivalent to:
|
2018-02-16 20:44:52 +00:00
|
|
|
+
|
2017-11-26 19:43:54 +00:00
|
|
|
------------
|
|
|
|
$ git worktree add --track -b <branch> <path> <remote>/<branch>
|
|
|
|
------------
|
|
|
|
+
|
checkout & worktree: introduce checkout.defaultRemote
Introduce a checkout.defaultRemote setting which can be used to
designate a remote to prefer (via checkout.defaultRemote=origin) when
running e.g. "git checkout master" to mean origin/master, even though
there's other remotes that have the "master" branch.
I want this because it's very handy to use this workflow to checkout a
repository and create a topic branch, then get back to a "master" as
retrieved from upstream:
(
cd /tmp &&
rm -rf tbdiff &&
git clone git@github.com:trast/tbdiff.git &&
cd tbdiff &&
git branch -m topic &&
git checkout master
)
That will output:
Branch 'master' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'master'
But as soon as a new remote is added (e.g. just to inspect something
from someone else) the DWIMery goes away:
(
cd /tmp &&
rm -rf tbdiff &&
git clone git@github.com:trast/tbdiff.git &&
cd tbdiff &&
git branch -m topic &&
git remote add avar git@github.com:avar/tbdiff.git &&
git fetch avar &&
git checkout master
)
Will output (without the advice output added earlier in this series):
error: pathspec 'master' did not match any file(s) known to git.
The new checkout.defaultRemote config allows me to say that whenever
that ambiguity comes up I'd like to prefer "origin", and it'll still
work as though the only remote I had was "origin".
Also adjust the advice.checkoutAmbiguousRemoteBranchName message to
mention this new config setting to the user, the full output on my
git.git is now (the last paragraph is new):
$ ./git --exec-path=$PWD checkout master
error: pathspec 'master' did not match any file(s) known to git.
hint: 'master' matched more than one remote tracking branch.
hint: We found 26 remotes with a reference that matched. So we fell back
hint: on trying to resolve the argument as a path, but failed there too!
hint:
hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
hint: you can do so by fully qualifying the name with the --track option:
hint:
hint: git checkout --track origin/<name>
hint:
hint: If you'd like to always have checkouts of an ambiguous <name> prefer
hint: one remote, e.g. the 'origin' remote, consider setting
hint: checkout.defaultRemote=origin in your config.
I considered splitting this into checkout.defaultRemote and
worktree.defaultRemote, but it's probably less confusing to break our
own rules that anything shared between config should live in core.*
than have two config settings, and I couldn't come up with a short
name under core.* that made sense (core.defaultRemoteForCheckout?).
See also 70c9ac2f19 ("DWIM "git checkout frotz" to "git checkout -b
frotz origin/frotz"", 2009-10-18) which introduced this DWIM feature
to begin with, and 4e85333197 ("worktree: make add <path> <branch>
dwim", 2017-11-26) which added it to git-worktree.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-05 14:40:49 +00:00
|
|
|
If the branch exists in multiple remotes and one of them is named by
|
|
|
|
the `checkout.defaultRemote` configuration variable, we'll use that
|
|
|
|
one for the purposes of disambiguation, even if the `<branch>` isn't
|
|
|
|
unique across all remotes. Set it to
|
|
|
|
e.g. `checkout.defaultRemote=origin` to always checkout remote
|
|
|
|
branches from there if `<branch>` is ambiguous but exists on the
|
2020-08-04 00:55:31 +00:00
|
|
|
`origin` remote. See also `checkout.defaultRemote` in
|
checkout & worktree: introduce checkout.defaultRemote
Introduce a checkout.defaultRemote setting which can be used to
designate a remote to prefer (via checkout.defaultRemote=origin) when
running e.g. "git checkout master" to mean origin/master, even though
there's other remotes that have the "master" branch.
I want this because it's very handy to use this workflow to checkout a
repository and create a topic branch, then get back to a "master" as
retrieved from upstream:
(
cd /tmp &&
rm -rf tbdiff &&
git clone git@github.com:trast/tbdiff.git &&
cd tbdiff &&
git branch -m topic &&
git checkout master
)
That will output:
Branch 'master' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'master'
But as soon as a new remote is added (e.g. just to inspect something
from someone else) the DWIMery goes away:
(
cd /tmp &&
rm -rf tbdiff &&
git clone git@github.com:trast/tbdiff.git &&
cd tbdiff &&
git branch -m topic &&
git remote add avar git@github.com:avar/tbdiff.git &&
git fetch avar &&
git checkout master
)
Will output (without the advice output added earlier in this series):
error: pathspec 'master' did not match any file(s) known to git.
The new checkout.defaultRemote config allows me to say that whenever
that ambiguity comes up I'd like to prefer "origin", and it'll still
work as though the only remote I had was "origin".
Also adjust the advice.checkoutAmbiguousRemoteBranchName message to
mention this new config setting to the user, the full output on my
git.git is now (the last paragraph is new):
$ ./git --exec-path=$PWD checkout master
error: pathspec 'master' did not match any file(s) known to git.
hint: 'master' matched more than one remote tracking branch.
hint: We found 26 remotes with a reference that matched. So we fell back
hint: on trying to resolve the argument as a path, but failed there too!
hint:
hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
hint: you can do so by fully qualifying the name with the --track option:
hint:
hint: git checkout --track origin/<name>
hint:
hint: If you'd like to always have checkouts of an ambiguous <name> prefer
hint: one remote, e.g. the 'origin' remote, consider setting
hint: checkout.defaultRemote=origin in your config.
I considered splitting this into checkout.defaultRemote and
worktree.defaultRemote, but it's probably less confusing to break our
own rules that anything shared between config should live in core.*
than have two config settings, and I couldn't come up with a short
name under core.* that made sense (core.defaultRemoteForCheckout?).
See also 70c9ac2f19 ("DWIM "git checkout frotz" to "git checkout -b
frotz origin/frotz"", 2009-10-18) which introduced this DWIM feature
to begin with, and 4e85333197 ("worktree: make add <path> <branch>
dwim", 2017-11-26) which added it to git-worktree.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-05 14:40:49 +00:00
|
|
|
linkgit:git-config[1].
|
|
|
|
+
|
2017-11-26 19:43:52 +00:00
|
|
|
If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
|
2020-08-04 00:55:32 +00:00
|
|
|
then, as a convenience, the new working tree is associated with a branch
|
2018-04-24 21:56:35 +00:00
|
|
|
(call it `<branch>`) named after `$(basename <path>)`. If `<branch>`
|
2020-08-04 00:55:31 +00:00
|
|
|
doesn't exist, a new branch based on `HEAD` is automatically created as
|
2018-04-24 21:56:35 +00:00
|
|
|
if `-b <branch>` was given. If `<branch>` does exist, it will be
|
2020-08-04 00:55:32 +00:00
|
|
|
checked out in the new working tree, if it's not checked out anywhere
|
|
|
|
else, otherwise the command will refuse to create the working tree (unless
|
2018-04-24 21:56:35 +00:00
|
|
|
`--force` is used).
|
2015-07-06 17:30:50 +00:00
|
|
|
|
2015-10-08 17:01:05 +00:00
|
|
|
list::
|
|
|
|
|
2020-08-04 00:55:32 +00:00
|
|
|
List details of each working tree. The main working tree is listed first,
|
|
|
|
followed by each of the linked working trees. The output details include
|
2020-08-04 00:55:33 +00:00
|
|
|
whether the working tree is bare, the revision currently checked out, and the
|
2020-08-04 00:55:32 +00:00
|
|
|
branch currently checked out (or "detached HEAD" if none).
|
2015-10-08 17:01:05 +00:00
|
|
|
|
2016-06-13 12:18:24 +00:00
|
|
|
lock::
|
|
|
|
|
|
|
|
If a working tree is on a portable device or network share which
|
|
|
|
is not always mounted, lock it to prevent its administrative
|
|
|
|
files from being pruned automatically. This also prevents it from
|
|
|
|
being moved or deleted. Optionally, specify a reason for the lock
|
|
|
|
with `--reason`.
|
|
|
|
|
2018-02-12 09:49:36 +00:00
|
|
|
move::
|
|
|
|
|
|
|
|
Move a working tree to a new location. Note that the main working tree
|
2020-08-31 06:57:57 +00:00
|
|
|
or linked working trees containing submodules cannot be moved with this
|
|
|
|
command. (The `git worktree repair` command, however, can reestablish
|
|
|
|
the connection with linked working trees if you move the main working
|
|
|
|
tree manually.)
|
2018-02-12 09:49:36 +00:00
|
|
|
|
2016-05-22 09:33:53 +00:00
|
|
|
prune::
|
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
Prune working tree information in `$GIT_DIR/worktrees`.
|
2016-05-22 09:33:53 +00:00
|
|
|
|
2018-02-12 09:49:39 +00:00
|
|
|
remove::
|
|
|
|
|
|
|
|
Remove a working tree. Only clean working trees (no untracked files
|
|
|
|
and no modification in tracked files) can be removed. Unclean working
|
|
|
|
trees or ones with submodules can be removed with `--force`. The main
|
|
|
|
working tree cannot be removed.
|
|
|
|
|
2020-08-31 06:57:58 +00:00
|
|
|
repair [<path>...]::
|
2020-08-27 08:21:25 +00:00
|
|
|
|
|
|
|
Repair working tree administrative files, if possible, if they have
|
|
|
|
become corrupted or outdated due to external factors.
|
2020-08-31 06:57:57 +00:00
|
|
|
+
|
|
|
|
For instance, if the main working tree (or bare repository) is moved,
|
|
|
|
linked working trees will be unable to locate it. Running `repair` in
|
|
|
|
the main working tree will reestablish the connection from linked
|
|
|
|
working trees back to the main working tree.
|
2020-08-31 06:57:58 +00:00
|
|
|
+
|
|
|
|
Similarly, if a linked working tree is moved without using `git worktree
|
|
|
|
move`, the main working tree (or bare repository) will be unable to
|
|
|
|
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.
|
2020-08-27 08:21:25 +00:00
|
|
|
|
2016-06-13 12:18:25 +00:00
|
|
|
unlock::
|
|
|
|
|
|
|
|
Unlock a working tree, allowing it to be pruned, moved or deleted.
|
|
|
|
|
2015-06-29 12:51:18 +00:00
|
|
|
OPTIONS
|
|
|
|
-------
|
|
|
|
|
2015-07-06 17:30:51 +00:00
|
|
|
-f::
|
|
|
|
--force::
|
2018-02-12 09:49:39 +00:00
|
|
|
By default, `add` refuses to create a new working tree when
|
|
|
|
`<commit-ish>` is a branch name and is already checked out by
|
2018-08-28 21:20:23 +00:00
|
|
|
another working tree, or if `<path>` is already assigned to some
|
|
|
|
working tree but is missing (for instance, if `<path>` was deleted
|
|
|
|
manually). This option overrides these safeguards. To add a missing but
|
|
|
|
locked working tree path, specify `--force` twice.
|
|
|
|
+
|
2018-08-28 21:20:24 +00:00
|
|
|
`move` refuses to move a locked working tree unless `--force` is specified
|
2020-06-10 06:30:49 +00:00
|
|
|
twice. If the destination is already assigned to some other working tree but is
|
|
|
|
missing (for instance, if `<new-path>` was deleted manually), then `--force`
|
2020-08-04 00:55:31 +00:00
|
|
|
allows the move to proceed; use `--force` twice if the destination is locked.
|
2018-08-28 21:20:24 +00:00
|
|
|
+
|
2018-08-28 21:20:23 +00:00
|
|
|
`remove` refuses to remove an unclean working tree unless `--force` is used.
|
2018-08-28 21:20:25 +00:00
|
|
|
To remove a locked working tree, specify `--force` twice.
|
2015-07-06 17:30:51 +00:00
|
|
|
|
2015-07-06 17:30:53 +00:00
|
|
|
-b <new-branch>::
|
|
|
|
-B <new-branch>::
|
|
|
|
With `add`, create a new branch named `<new-branch>` starting at
|
2017-11-26 19:43:52 +00:00
|
|
|
`<commit-ish>`, and check out `<new-branch>` into the new working tree.
|
2020-08-04 00:55:31 +00:00
|
|
|
If `<commit-ish>` is omitted, it defaults to `HEAD`.
|
2015-07-06 17:30:53 +00:00
|
|
|
By default, `-b` refuses to create a new branch if it already
|
|
|
|
exists. `-B` overrides this safeguard, resetting `<new-branch>` to
|
2017-11-26 19:43:52 +00:00
|
|
|
`<commit-ish>`.
|
2015-07-06 17:30:53 +00:00
|
|
|
|
2020-09-07 00:02:21 +00:00
|
|
|
-d::
|
2015-07-06 17:30:52 +00:00
|
|
|
--detach::
|
2020-08-04 00:55:31 +00:00
|
|
|
With `add`, detach `HEAD` in the new working tree. See "DETACHED HEAD"
|
2015-07-20 05:29:18 +00:00
|
|
|
in linkgit:git-checkout[1].
|
2015-07-06 17:30:52 +00:00
|
|
|
|
2016-03-29 10:11:01 +00:00
|
|
|
--[no-]checkout::
|
2017-11-26 19:43:52 +00:00
|
|
|
By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can
|
2016-03-29 10:11:01 +00:00
|
|
|
be used to suppress checkout in order to make customizations,
|
|
|
|
such as configuring sparse-checkout. See "Sparse checkout"
|
|
|
|
in linkgit:git-read-tree[1].
|
|
|
|
|
2017-11-29 20:04:50 +00:00
|
|
|
--[no-]guess-remote::
|
|
|
|
With `worktree add <path>`, without `<commit-ish>`, instead
|
2020-08-04 00:55:31 +00:00
|
|
|
of creating a new branch from `HEAD`, if there exists a tracking
|
2018-01-11 18:18:21 +00:00
|
|
|
branch in exactly one remote matching the basename of `<path>`,
|
2017-11-29 20:04:50 +00:00
|
|
|
base the new branch on the remote-tracking branch, and mark
|
|
|
|
the remote-tracking branch as "upstream" from the new branch.
|
2017-11-29 20:04:51 +00:00
|
|
|
+
|
|
|
|
This can also be set up as the default behaviour by using the
|
|
|
|
`worktree.guessRemote` config option.
|
2017-11-29 20:04:50 +00:00
|
|
|
|
2017-11-26 19:43:53 +00:00
|
|
|
--[no-]track::
|
|
|
|
When creating a new branch, if `<commit-ish>` is a branch,
|
|
|
|
mark it as "upstream" from the new branch. This is the
|
|
|
|
default if `<commit-ish>` is a remote-tracking branch. See
|
2020-08-04 00:55:31 +00:00
|
|
|
`--track` in linkgit:git-branch[1] for details.
|
2017-11-26 19:43:53 +00:00
|
|
|
|
2017-04-12 13:58:05 +00:00
|
|
|
--lock::
|
|
|
|
Keep the working tree locked after creation. This is the
|
|
|
|
equivalent of `git worktree lock` after `git worktree add`,
|
2020-08-04 00:55:33 +00:00
|
|
|
but without a race condition.
|
2017-04-12 13:58:05 +00:00
|
|
|
|
2015-06-29 12:51:18 +00:00
|
|
|
-n::
|
|
|
|
--dry-run::
|
2015-07-06 17:30:39 +00:00
|
|
|
With `prune`, do not remove anything; just report what it would
|
2015-06-29 12:51:18 +00:00
|
|
|
remove.
|
|
|
|
|
2015-10-08 17:01:05 +00:00
|
|
|
--porcelain::
|
|
|
|
With `list`, output in an easy-to-parse format for scripts.
|
|
|
|
This format will remain stable across Git versions and regardless of user
|
|
|
|
configuration. See below for details.
|
|
|
|
|
2018-08-15 20:56:30 +00:00
|
|
|
-q::
|
|
|
|
--quiet::
|
2020-08-04 00:55:31 +00:00
|
|
|
With `add`, suppress feedback messages.
|
2018-08-15 20:56:30 +00:00
|
|
|
|
2015-06-29 12:51:18 +00:00
|
|
|
-v::
|
|
|
|
--verbose::
|
2015-07-06 17:30:39 +00:00
|
|
|
With `prune`, report all removals.
|
2015-06-29 12:51:18 +00:00
|
|
|
|
|
|
|
--expire <time>::
|
2020-08-04 00:55:31 +00:00
|
|
|
With `prune`, only expire unused working trees older than `<time>`.
|
2015-06-29 12:51:18 +00:00
|
|
|
|
2016-06-13 12:18:24 +00:00
|
|
|
--reason <string>::
|
|
|
|
With `lock`, an explanation why the working tree is locked.
|
|
|
|
|
|
|
|
<worktree>::
|
|
|
|
Working trees can be identified by path, either relative or
|
|
|
|
absolute.
|
2016-06-13 12:18:26 +00:00
|
|
|
+
|
|
|
|
If the last path components in the working tree's path is unique among
|
2020-08-04 00:55:33 +00:00
|
|
|
working trees, it can be used to identify a working tree. For example if
|
2020-08-04 00:55:31 +00:00
|
|
|
you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
|
|
|
|
then `ghi` or `def/ghi` is enough to point to the former working tree.
|
2016-06-13 12:18:24 +00:00
|
|
|
|
2018-09-29 19:10:23 +00:00
|
|
|
REFS
|
|
|
|
----
|
|
|
|
In multiple working trees, some refs may be shared between all working
|
2020-08-04 00:55:33 +00:00
|
|
|
trees and some refs are local. One example is `HEAD` which is different for each
|
|
|
|
working tree. This section is about the sharing rules and how to access
|
2018-10-21 08:08:54 +00:00
|
|
|
refs of one working tree from another.
|
2018-09-29 19:10:23 +00:00
|
|
|
|
|
|
|
In general, all pseudo refs are per working tree and all refs starting
|
2020-08-04 00:55:31 +00:00
|
|
|
with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
|
2020-08-04 00:55:33 +00:00
|
|
|
directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are
|
|
|
|
exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not
|
2018-09-29 19:10:23 +00:00
|
|
|
shared.
|
|
|
|
|
2018-10-21 08:08:54 +00:00
|
|
|
Refs that are per working tree can still be accessed from another
|
2020-08-04 00:55:31 +00:00
|
|
|
working tree via two special paths, `main-worktree` and `worktrees`. The
|
2020-08-04 00:55:32 +00:00
|
|
|
former gives access to per-working tree refs of the main working tree,
|
2018-10-21 08:08:54 +00:00
|
|
|
while the latter to all linked working trees.
|
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good`
|
|
|
|
resolve to the same value as the main working tree's `HEAD` and
|
|
|
|
`refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or
|
|
|
|
`worktrees/bar/refs/bisect/bad` are the same as
|
|
|
|
`$GIT_COMMON_DIR/worktrees/foo/HEAD` and
|
|
|
|
`$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`.
|
2018-10-21 08:08:54 +00:00
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
To access refs, it's best not to look inside `$GIT_DIR` directly. Instead
|
2018-11-03 05:14:18 +00:00
|
|
|
use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1]
|
2018-09-29 19:10:23 +00:00
|
|
|
which will handle refs correctly.
|
|
|
|
|
2018-10-21 14:02:28 +00:00
|
|
|
CONFIGURATION FILE
|
|
|
|
------------------
|
2020-08-04 00:55:31 +00:00
|
|
|
By default, the repository `config` file is shared across all working
|
2018-10-21 14:02:28 +00:00
|
|
|
trees. If the config variables `core.bare` or `core.worktree` are
|
|
|
|
already present in the config file, they will be applied to the main
|
|
|
|
working trees only.
|
|
|
|
|
|
|
|
In order to have configuration specific to working trees, you can turn
|
2020-08-04 00:55:33 +00:00
|
|
|
on the `worktreeConfig` extension, e.g.:
|
2018-10-21 14:02:28 +00:00
|
|
|
|
|
|
|
------------
|
|
|
|
$ git config extensions.worktreeConfig true
|
|
|
|
------------
|
|
|
|
|
|
|
|
In this mode, specific configuration stays in the path pointed by `git
|
|
|
|
rev-parse --git-path config.worktree`. You can add or update
|
|
|
|
configuration in this file with `git config --worktree`. Older Git
|
|
|
|
versions will refuse to access repositories with this extension.
|
|
|
|
|
|
|
|
Note that in this file, the exception for `core.bare` and `core.worktree`
|
2020-08-04 00:55:33 +00:00
|
|
|
is gone. If they exist in `$GIT_DIR/config`, you must move
|
2018-10-21 14:02:28 +00:00
|
|
|
them to the `config.worktree` of the main working tree. You may also
|
|
|
|
take this opportunity to review and move other configuration that you
|
|
|
|
do not want to share to all working trees:
|
|
|
|
|
|
|
|
- `core.worktree` and `core.bare` should never be shared
|
|
|
|
|
|
|
|
- `core.sparseCheckout` is recommended per working tree, unless you
|
|
|
|
are sure you always use sparse checkout for all working trees.
|
|
|
|
|
2015-07-06 17:30:42 +00:00
|
|
|
DETAILS
|
|
|
|
-------
|
|
|
|
Each linked working tree has a private sub-directory in the repository's
|
2020-08-04 00:55:31 +00:00
|
|
|
`$GIT_DIR/worktrees` directory. The private sub-directory's name is usually
|
2015-07-06 17:30:42 +00:00
|
|
|
the base name of the linked working tree's path, possibly appended with a
|
|
|
|
number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the
|
2015-07-16 22:09:43 +00:00
|
|
|
command `git worktree add /path/other/test-next next` creates the linked
|
2015-07-06 17:30:42 +00:00
|
|
|
working tree in `/path/other/test-next` and also creates a
|
|
|
|
`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`
|
|
|
|
if `test-next` is already taken).
|
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
Within a linked working tree, `$GIT_DIR` is set to point to this private
|
2015-07-06 17:30:42 +00:00
|
|
|
directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and
|
2020-08-04 00:55:31 +00:00
|
|
|
`$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR`
|
2015-07-06 17:30:42 +00:00
|
|
|
(e.g. `/path/main/.git`). These settings are made in a `.git` file located at
|
|
|
|
the top directory of the linked working tree.
|
|
|
|
|
|
|
|
Path resolution via `git rev-parse --git-path` uses either
|
2020-08-04 00:55:31 +00:00
|
|
|
`$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the
|
2015-07-06 17:30:42 +00:00
|
|
|
linked working tree `git rev-parse --git-path HEAD` returns
|
|
|
|
`/path/main/.git/worktrees/test-next/HEAD` (not
|
|
|
|
`/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git
|
|
|
|
rev-parse --git-path refs/heads/master` uses
|
2020-08-04 00:55:31 +00:00
|
|
|
`$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`,
|
|
|
|
since refs are shared across all working trees, except `refs/bisect` and
|
|
|
|
`refs/worktree`.
|
2015-07-06 17:30:42 +00:00
|
|
|
|
|
|
|
See linkgit:gitrepository-layout[5] for more information. The rule of
|
|
|
|
thumb is do not make any assumption about whether a path belongs to
|
2020-08-04 00:55:31 +00:00
|
|
|
`$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something
|
|
|
|
inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path.
|
2015-07-06 17:30:42 +00:00
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
If you manually move a linked working tree, you need to update the `gitdir` file
|
2016-01-22 08:35:49 +00:00
|
|
|
in the entry's directory. For example, if a linked working tree is moved
|
|
|
|
to `/newpath/test-next` and its `.git` file points to
|
|
|
|
`/path/main/.git/worktrees/test-next`, then update
|
|
|
|
`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next`
|
2020-08-31 06:57:58 +00:00
|
|
|
instead. Better yet, run `git worktree repair` to reestablish the connection
|
|
|
|
automatically.
|
2016-01-22 08:35:49 +00:00
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
To prevent a `$GIT_DIR/worktrees` entry from being pruned (which
|
2015-07-06 17:30:43 +00:00
|
|
|
can be useful in some situations, such as when the
|
2016-06-13 12:18:24 +00:00
|
|
|
entry's working tree is stored on a portable device), use the
|
|
|
|
`git worktree lock` command, which adds a file named
|
2020-08-04 00:55:31 +00:00
|
|
|
`locked` to the entry's directory. The file contains the reason in
|
2015-07-06 17:30:43 +00:00
|
|
|
plain text. For example, if a linked working tree's `.git` file points
|
|
|
|
to `/path/main/.git/worktrees/test-next` then a file named
|
|
|
|
`/path/main/.git/worktrees/test-next/locked` will prevent the
|
|
|
|
`test-next` entry from being pruned. See
|
|
|
|
linkgit:gitrepository-layout[5] for details.
|
|
|
|
|
2020-08-04 00:55:31 +00:00
|
|
|
When `extensions.worktreeConfig` is enabled, the config file
|
2018-10-21 14:02:28 +00:00
|
|
|
`.git/worktrees/<id>/config.worktree` is read after `.git/config` is.
|
2015-07-06 17:30:43 +00:00
|
|
|
|
2015-10-08 17:01:05 +00:00
|
|
|
LIST OUTPUT FORMAT
|
|
|
|
------------------
|
2020-08-04 00:55:31 +00:00
|
|
|
The `worktree list` command has two output formats. The default format shows the
|
2015-10-08 17:01:05 +00:00
|
|
|
details on a single line with columns. For example:
|
|
|
|
|
|
|
|
------------
|
2018-04-09 07:34:00 +00:00
|
|
|
$ git worktree list
|
2015-10-08 17:01:05 +00:00
|
|
|
/path/to/bare-source (bare)
|
|
|
|
/path/to/linked-worktree abcd1234 [master]
|
|
|
|
/path/to/other-linked-worktree 1234abc (detached HEAD)
|
|
|
|
------------
|
|
|
|
|
|
|
|
Porcelain Format
|
|
|
|
~~~~~~~~~~~~~~~~
|
|
|
|
The porcelain format has a line per attribute. Attributes are listed with a
|
2020-08-04 00:55:31 +00:00
|
|
|
label and value separated by a single space. Boolean attributes (like `bare`
|
2020-08-04 00:55:33 +00:00
|
|
|
and `detached`) are listed as a label only, and are present only
|
2020-08-04 00:55:32 +00:00
|
|
|
if the value is true. The first attribute of a working tree is always
|
|
|
|
`worktree`, an empty line indicates the end of the record. For example:
|
2015-10-08 17:01:05 +00:00
|
|
|
|
|
|
|
------------
|
2018-04-09 07:34:00 +00:00
|
|
|
$ git worktree list --porcelain
|
2015-10-08 17:01:05 +00:00
|
|
|
worktree /path/to/bare-source
|
|
|
|
bare
|
|
|
|
|
|
|
|
worktree /path/to/linked-worktree
|
|
|
|
HEAD abcd1234abcd1234abcd1234abcd1234abcd1234
|
|
|
|
branch refs/heads/master
|
|
|
|
|
|
|
|
worktree /path/to/other-linked-worktree
|
|
|
|
HEAD 1234abc1234abc1234abc1234abc1234abc1234a
|
|
|
|
detached
|
|
|
|
|
|
|
|
------------
|
|
|
|
|
2015-07-06 17:30:44 +00:00
|
|
|
EXAMPLES
|
|
|
|
--------
|
|
|
|
You are in the middle of a refactoring session and your boss comes in and
|
|
|
|
demands that you fix something immediately. You might typically use
|
|
|
|
linkgit:git-stash[1] to store your changes away temporarily, however, your
|
2015-07-20 05:29:18 +00:00
|
|
|
working tree is in such a state of disarray (with new, moved, and removed
|
|
|
|
files, and other bits and pieces strewn around) that you don't want to risk
|
|
|
|
disturbing any of it. Instead, you create a temporary linked working tree to
|
2015-07-06 17:30:44 +00:00
|
|
|
make the emergency fix, remove it when done, and then resume your earlier
|
|
|
|
refactoring session.
|
|
|
|
|
|
|
|
------------
|
2015-07-06 17:30:53 +00:00
|
|
|
$ git worktree add -b emergency-fix ../temp master
|
2015-07-06 17:30:44 +00:00
|
|
|
$ pushd ../temp
|
|
|
|
# ... hack hack hack ...
|
|
|
|
$ git commit -a -m 'emergency fix for boss'
|
|
|
|
$ popd
|
2018-04-09 07:33:59 +00:00
|
|
|
$ git worktree remove ../temp
|
2015-07-06 17:30:44 +00:00
|
|
|
------------
|
|
|
|
|
2015-07-06 17:30:41 +00:00
|
|
|
BUGS
|
|
|
|
----
|
2015-07-16 22:59:48 +00:00
|
|
|
Multiple checkout in general is still experimental, and the support
|
|
|
|
for submodules is incomplete. It is NOT recommended to make multiple
|
|
|
|
checkouts of a superproject.
|
2015-07-06 17:30:41 +00:00
|
|
|
|
2015-06-29 12:51:18 +00:00
|
|
|
GIT
|
|
|
|
---
|
|
|
|
Part of the linkgit:git[1] suite
|