# [PATCH] worktree: Correct typo in documentation 3 messages from 2015-07-29 to 2015-07-30. Participants: Johan Sageryd, Eric Sunshine. Thread: https://gitlist.dev/t/39969 ## Johan Sageryd, 2015-07-29 23:03 Subject: [PATCH] worktree: Correct typo in documentation Message-ID: <1438211028-22403-1-git-send-email-j@1616.se> URL: https://gitlist.dev/e/1438211028-22403-1-git-send-email-j%401616.se ``` Signed-off-by: Johan Sageryd --- 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 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, 2015-07-30 05:36 Subject: Re: [PATCH] worktree: Correct typo in documentation Message-ID: URL: https://gitlist.dev/e/CAPig%2BcSy7qVBwBznJDhzmx%3DYrPVd%3DGhTJkcG4Q5mh%2B3T5DgJGA%40mail.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 wrote: > Signed-off-by: Johan Sageryd > --- > 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, 2015-07-30 06:15 Subject: Re: [PATCH] worktree: Correct typo in documentation Message-ID: URL: https://gitlist.dev/e/CAP-NwxjdTc6DWbVzQu9%3D0K_Gz1zYf35bZX8yHFTuav7iCV4ohA%40mail.gmail.com In-Reply-To: ``` > 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 ```