git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: ps@pks.im, sunshine@sunshineco.com
Subject: [PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file
Date: Tue,  4 Aug 2015 14:27:58 +0200	[thread overview]
Message-ID: <1438691278-31609-2-git-send-email-ps@pks.im> (raw)
In-Reply-To: <1438691278-31609-1-git-send-email-ps@pks.im>

The documentation of git-worktree refers to the 'locked' file as
'lock'. Fix this to say 'locked' instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 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 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.
 
-- 
2.5.0

  reply	other threads:[~2015-08-04 12:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-04 12:27 [PATCH 1/2] Documentation/git-worktree: fix duplicated 'from' Patrick Steinhardt
2015-08-04 12:27 ` Patrick Steinhardt [this message]
2015-08-04 18:18   ` [PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file Eric Sunshine
2015-08-04 18:27 ` [PATCH 1/2] Documentation/git-worktree: fix duplicated 'from' Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438691278-31609-2-git-send-email-ps@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).