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://www.git.lorimer.id.au/gitweb.git/diff_plain/797d1a4672c67ed4e560c67c5d1fe208e31f0b47?hp=d92466ee25ca2dd79c6f0f7a804f765a5930990c Merge branch 'nd/worktree-lock' into maint Typofix. * nd/worktree-lock: git-worktree.txt: fix typo "to"/"two", and add comma --- diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 0aeb020d02..e257c19ebe 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -133,7 +133,7 @@ OPTIONS + 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