Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/worktree-lock' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 29 Nov 2016 21:28:02 +0000
(13:28 -0800)
committer
Junio 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
patch
|
blob
|
history
raw
(from parent 1:
d92466e
)
diff --git
a/Documentation/git-worktree.txt
b/Documentation/git-worktree.txt
index 0aeb020d026f59ad435c72e752d6f9c2f3cec73b..e257c19ebed96c3ab4877a752c3545e2d98c5d84 100644
(file)
--- 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 t
o working trees
at "/abc/def/ghi" and "/abc/def/ggg",
+you only have t
wo 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