Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: [PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:06:05

On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt [off-list ref] wrote:
The documentation of git-worktree refers to the 'locked' file as
'lock'. Fix this to say 'locked' instead.
Thanks for the patch. This is already fixed in 'next' by 2e73ab6
(Documentation/git-worktree: fix incorrect reference to file "locked",
2015-07-20)
quoted hunk ↗ jump to hunk
Signed-off-by: Patrick Steinhardt <redacted>
---
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 566ca92..3fedd9e 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.

 If a linked working tree is stored on a portable device or network share
 which is not always mounted, you can prevent its administrative files from
-being pruned by creating a file named 'lock' alongside the other
+being pruned by creating a file named 'locked' alongside the other
 administrative files, optionally containing a plain text reason that
 pruning should be suppressed. See section "DETAILS" for more information.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help