Re: [PATCH] worktree: Correct typo in documentation

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jul 30, 2015, 05:36 UTC
Message-ID: <CAPig+cSy7qVBwBznJDhzmx=YrPVd=GhTJkcG4Q5mh+3T5DgJGA@mail.gmail.com>
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:

Show 14 quoted lines

> 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).