Merge branch 'nd/worktree-lock' into maint

gitster · gitster · commit 797d1a4672c6 · 2016-11-29T13:28:02.000-08:00
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ OPTIONS`
`133`	`133`	`+`
`134`	`134`	`If the last path components in the working tree's path is unique among`
`135`	`135`	`working trees, it can be used to identify worktrees. For example if`
`136`		`-you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg",`
	`136`	`+you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg",`
`137`	`137`	`then "ghi" or "def/ghi" is enough to point to the former working tree.`
`138`	`138`
`139`	`139`	`DETAILS`