threads / patch / 39969

patchworktree: Correct typo in documentation

Subject: [PATCH] worktree: Correct typo in documentation

## tl;dr

3 messages between Jul 29, 2015 and Jul 30, 2015. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Johan Sageryd· Jul 29, 2015, 23:03 UTC · lore

Signed-off-by: Johan Sageryd <j@1616.se>
---
 Documentation/git-worktree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-worktree.txt +1 −1

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.

-- 
2.5.0

Eric Sunshine· Jul 30, 2015, 05:36 UTC · re: Johan Sageryd · lore

Re: [PATCH] worktree: Correct typo in documentation

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

Johan Sageryd· Jul 30, 2015, 06:15 UTC · re: Eric Sunshine · lore

Re: [PATCH] worktree: Correct typo in documentation

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

You are right; sorry for the noise. I checked only maint and master.

/J