* [PATCH] worktree: Correct typo in documentation
@ 2015-07-29 23:03 Johan Sageryd
2015-07-30 5:36 ` Eric Sunshine
0 siblings, 1 reply; 3+ messages in thread
From: Johan Sageryd @ 2015-07-29 23:03 UTC (permalink / raw)
To: git; +Cc: Eric Sunshine, Johan Sageryd
Signed-off-by: Johan Sageryd <j@1616.se>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] worktree: Correct typo in documentation
2015-07-29 23:03 [PATCH] worktree: Correct typo in documentation Johan Sageryd
@ 2015-07-30 5:36 ` Eric Sunshine
2015-07-30 6:15 ` Johan Sageryd
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sunshine @ 2015-07-30 5:36 UTC (permalink / raw)
To: Johan Sageryd; +Cc: Git List
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).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] worktree: Correct typo in documentation
2015-07-30 5:36 ` Eric Sunshine
@ 2015-07-30 6:15 ` Johan Sageryd
0 siblings, 0 replies; 3+ messages in thread
From: Johan Sageryd @ 2015-07-30 6:15 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Git List
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-30 6:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-29 23:03 [PATCH] worktree: Correct typo in documentation Johan Sageryd
2015-07-30 5:36 ` Eric Sunshine
2015-07-30 6:15 ` Johan Sageryd
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).