{"thread":{"id":"39969","subject":"[PATCH] worktree: Correct typo in documentation","startedAt":"2015-07-29T23:03:48Z","lastAt":"2015-07-30T06:15:21Z","messageCount":3,"participants":["Johan Sageryd","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"267114","messageId":"1438211028-22403-1-git-send-email-j@1616.se","threadId":"39969","inReplyTo":null,"subject":"[PATCH] worktree: Correct typo in documentation","fromName":"Johan Sageryd","fromEmail":"j@1616.se","sentAt":"2015-07-29T23:03:48Z","receivedAt":"2015-07-29T23:03:48Z","isPatch":true,"sender":{"key":"j@1616.se","avatar":"https://gravatar.com/avatar/eb602c146730618d17e6ddc115a07261c7c7a036c11d46c6621406aac3474866?d=mp&s=160"},"body":"Signed-off-by: Johan Sageryd <j@1616.se>\n---\n Documentation/git-worktree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex 3387e2f..d9d90b5 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.\n \n If a linked working tree is stored on a portable device or network share\n which is not always mounted, you can prevent its administrative files from\n-being pruned by creating a file named 'lock' alongside the other\n+being pruned by creating a file named 'locked' alongside the other\n administrative files, optionally containing a plain text reason that\n pruning should be suppressed. See section \"DETAILS\" for more information.\n \n-- \n2.5.0\n"},{"id":"267120","messageId":"CAPig+cSy7qVBwBznJDhzmx=YrPVd=GhTJkcG4Q5mh+3T5DgJGA@mail.gmail.com","threadId":"39969","inReplyTo":"1438211028-22403-1-git-send-email-j@1616.se","subject":"Re: [PATCH] worktree: Correct typo in documentation","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-07-30T05:36:24Z","receivedAt":"2015-07-30T05:36:24Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, Jul 29, 2015 at 7:03 PM, Johan Sageryd <j@1616.se> wrote:\n> Signed-off-by: Johan Sageryd <j@1616.se>\n> ---\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> index 3387e2f..d9d90b5 100644\n> --- a/Documentation/git-worktree.txt\n> +++ b/Documentation/git-worktree.txt\n> @@ -39,7 +39,7 @@ repository so that they do not get automatically pruned.\n>\n>  If a linked working tree is stored on a portable device or network share\n>  which is not always mounted, you can prevent its administrative files from\n> -being pruned by creating a file named 'lock' alongside the other\n> +being pruned by creating a file named 'locked' alongside the other\n>  administrative files, optionally containing a plain text reason that\n>  pruning should be suppressed. See section \"DETAILS\" for more information.\n\nThanks for the patch. This is already fixed in the 'next' branch by\n2e73ab6 (Documentation/git-worktree: fix incorrect reference to file\n\"locked\", 2015-07-20).\n"},{"id":"267122","messageId":"CAP-NwxjdTc6DWbVzQu9=0K_Gz1zYf35bZX8yHFTuav7iCV4ohA@mail.gmail.com","threadId":"39969","inReplyTo":"CAPig+cSy7qVBwBznJDhzmx=YrPVd=GhTJkcG4Q5mh+3T5DgJGA@mail.gmail.com","subject":"Re: [PATCH] worktree: Correct typo in documentation","fromName":"Johan Sageryd","fromEmail":"j@1616.se","sentAt":"2015-07-30T06:15:21Z","receivedAt":"2015-07-30T06:15:21Z","isPatch":true,"sender":{"key":"j@1616.se","avatar":"https://gravatar.com/avatar/eb602c146730618d17e6ddc115a07261c7c7a036c11d46c6621406aac3474866?d=mp&s=160"},"body":"> Thanks for the patch. This is already fixed in the 'next' branch by\n> 2e73ab6 (Documentation/git-worktree: fix incorrect reference to file\n> \"locked\", 2015-07-20).\n\nYou are right; sorry for the noise. I checked only maint and master.\n\n/J\n"}]}