Merge branch 'nd/worktree-lock' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:02 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:02 +0000 (13:28 -0800)
Typofix.

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

Documentation/git-worktree.txt
index 0aeb020d026f59ad435c72e752d6f9c2f3cec73b..e257c19ebed96c3ab4877a752c3545e2d98c5d84 100644 (file)
@@ -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