diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2015-07-20 01:29:19 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:03:57 -0700 |
| commit | 2e73ab6e697ff8a98fd359321b584d01fa4f8672 (patch) | |
| tree | b315d69d760b40b2be54fce37b6752bb7aee91b1 /Documentation/git-worktree.txt | |
| parent | Documentation/git-worktree: consistently use term "linked working tree" (diff) | |
| download | tgif-2e73ab6e697ff8a98fd359321b584d01fa4f8672.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-worktree.txt')
| -rw-r--r-- | Documentation/git-worktree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. |