From: Junio C Hamano Date: Tue, 29 Nov 2016 21:28:02 +0000 (-0800) Subject: Merge branch 'nd/worktree-lock' into maint X-Git-Tag: v2.10.3~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/797d1a4672c67ed4e560c67c5d1fe208e31f0b47?hp=-c Merge branch 'nd/worktree-lock' into maint Typofix. * nd/worktree-lock: git-worktree.txt: fix typo "to"/"two", and add comma --- 797d1a4672c67ed4e560c67c5d1fe208e31f0b47 diff --combined Documentation/git-worktree.txt index 0aeb020d02,cb263733dd..e257c19ebe --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@@ -49,8 -49,7 +49,8 @@@ add []: Create `` and checkout `` into it. The new working directory is linked to the current repository, sharing everything except working -directory specific files such as HEAD, index, etc. +directory specific files such as HEAD, index, etc. `-` may also be +specified as ``; it is synonymous with `@{-1}`. + If `` is omitted and neither `-b` nor `-B` nor `--detached` used, then, as a convenience, a new branch based at HEAD is created automatically, @@@ -133,7 -132,7 +133,7 @@@ OPTION + If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if - you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg", + 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. DETAILS