From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Nov 2016 21:45:21 +0000 (-0800)
Subject: Merge branch 'nd/worktree-lock'
X-Git-Tag: v2.11.0-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/166251c32e69e9a66913c62e9263135f8ae103e6?hp=-c

Merge branch 'nd/worktree-lock'

Typofix.

* nd/worktree-lock:
git-worktree.txt: fix typo "to"/"two", and add comma
---

166251c32e69e9a66913c62e9263135f8ae103e6
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 <path> [<branch>]:
  
  Create `<path>` and checkout `<branch>` 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 `<branch>`; it is synonymous with `@{-1}`.
  +
  If `<branch>` 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