From: Eric Sunshine Date: Mon, 20 Jul 2015 05:29:19 GMT Subject: [PATCH v2 2/5] Documentation/git-worktree: fix incorrect reference to file "locked" Message-ID: <1437370162-8031-3-git-send-email-sunshine@sunshineco.com> In-Reply-To: <1437370162-8031-1-git-send-email-sunshine@sunshineco.com> From: Michael Haggerty 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 --- 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 60e5cf9..a6d8ad7 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.5.0.rc2.386.g87d813d