git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Johan Sageryd <j@1616.se>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] worktree: Correct typo in documentation
Date: Thu, 30 Jul 2015 01:36:24 -0400	[thread overview]
Message-ID: <CAPig+cSy7qVBwBznJDhzmx=YrPVd=GhTJkcG4Q5mh+3T5DgJGA@mail.gmail.com> (raw)
In-Reply-To: <1438211028-22403-1-git-send-email-j@1616.se>

On Wed, Jul 29, 2015 at 7:03 PM, Johan Sageryd <j@1616.se> wrote:
> Signed-off-by: Johan Sageryd <j@1616.se>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 3387e2f..d9d90b5 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.

Thanks for the patch. This is already fixed in the 'next' branch by
2e73ab6 (Documentation/git-worktree: fix incorrect reference to file
"locked", 2015-07-20).

  reply	other threads:[~2015-07-30  5:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-29 23:03 [PATCH] worktree: Correct typo in documentation Johan Sageryd
2015-07-30  5:36 ` Eric Sunshine [this message]
2015-07-30  6:15   ` Johan Sageryd

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to='CAPig+cSy7qVBwBznJDhzmx=YrPVd=GhTJkcG4Q5mh+3T5DgJGA@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=j@1616.se \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).