From 2e73ab6e697ff8a98fd359321b584d01fa4f8672 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 20 Jul 2015 01:29:19 -0400 Subject: [PATCH] Documentation/git-worktree: fix incorrect reference to file "locked" The administrative file to suppress pruning is named "locked", not "lock". [es: don't touch unrelated "git worktree lock" command; reword commit message] Signed-off-by: Michael Haggerty Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 60e5cf9286..a6d8ad763a 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. -- 2.11.4.GIT