summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-22 14:24:24 -0700
commit342215be59d3dc4b18db3d4a61fcfe4dc72149b7 (patch)
treee9ed027c93c2c2eaa7e0d6a7020b3c4f6a1468c8
parentMerge branch 'gs/test-unset-xdg-cache-home' into maint (diff)
parentgit-worktree.txt: fix indentation of example and text of 'add' command (diff)
downloadtgif-342215be59d3dc4b18db3d4a61fcfe4dc72149b7.tar.xz
Merge branch 'tg/worktree-create-tracking' into maint
Hotfix for a recent topic. * tg/worktree-create-tracking: git-worktree.txt: fix indentation of example and text of 'add' command git-worktree.txt: fix missing ")" typo
-rw-r--r--Documentation/git-worktree.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 41585f535d..5ac3f68ab5 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -52,10 +52,11 @@ is linked to the current repository, sharing everything except working
directory specific files such as HEAD, index, etc. `-` may also be
specified as `<commit-ish>`; it is synonymous with `@{-1}`.
+
-If <commit-ish> is a branch name (call it `<branch>` and is not found,
+If <commit-ish> is a branch name (call it `<branch>`) and is not found,
and neither `-b` nor `-B` nor `--detach` are used, but there does
exist a tracking branch in exactly one remote (call it `<remote>`)
-with a matching name, treat as equivalent to
+with a matching name, treat as equivalent to:
++
------------
$ git worktree add --track -b <branch> <path> <remote>/<branch>
------------