summaryrefslogtreecommitdiffstats
path: root/git-worktree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-02 16:01:45 -0700
committerJunio C Hamano <gitster@pobox.com>2018-08-02 16:01:45 -0700
commitf09b7cd0fc08d1df0fbd5c756672772049836b7a (patch)
treef5407aed048f255184084b9127f43dbf337eb27a /git-worktree.txt
parent1ff0338e53a8f0c62e5a9370e770e20058c5ad1e (diff)
downloadgit-htmldocs-f09b7cd0fc08d1df0fbd5c756672772049836b7a.tar.gz
Autogenerated HTML docs for v2.18.0-547-g1d893
Diffstat (limited to 'git-worktree.txt')
-rw-r--r--git-worktree.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/git-worktree.txt b/git-worktree.txt
index afc6576a1..9c26be40f 100644
--- a/git-worktree.txt
+++ b/git-worktree.txt
@@ -60,6 +60,15 @@ with a matching name, treat as equivalent to:
$ git worktree add --track -b <branch> <path> <remote>/<branch>
------------
+
+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
+'origin' remote. See also `checkout.defaultRemote` in
+linkgit:git-config[1].
++
If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
then, as a convenience, the new worktree is associated with a branch
(call it `<branch>`) named after `$(basename <path>)`. If `<branch>`