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 <mhagger@alum.mit.edu> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed Jul 20, 2015 at 01:29 UTC 2e73ab6e697ff8a98fd359321b584d01fa4f8672
1 file changed +1 -1
Documentation/git-worktree.txt
+1 -1
@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.
39
40 If a linked working tree is stored on a portable device or network share
41 which is not always mounted, you can prevent its administrative files from
42 -being pruned by creating a file named 'lock' alongside the other
42 +being pruned by creating a file named 'locked' alongside the other
43 administrative files, optionally containing a plain text reason that
44 pruning should be suppressed. See section "DETAILS" for more information.
45