[PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'

[PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'

[Patrick Steinhardt]

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 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..566ca92 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to
 $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
 inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
 
-To prevent a $GIT_DIR/worktrees entry from from being pruned (which
+To prevent a $GIT_DIR/worktrees entry from being pruned (which
 can be useful in some situations, such as when the
 entry's working tree is stored on a portable device), add a file named
 'locked' to the entry's directory. The file contains the reason in
-- 
2.5.0

[PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file

[Patrick Steinhardt]

The documentation of git-worktree refers to the 'locked' file as
'lock'. Fix this to say 'locked' instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 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 566ca92..3fedd9e 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

Re: [PATCH 2/2] Documentation/git-worktree: fix reference to 'locked' file

[Eric Sunshine]

On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt <ps@pks.im> wrote:
> The documentation of git-worktree refers to the 'locked' file as
> 'lock'. Fix this to say 'locked' instead.

Thanks for the patch. This is already fixed in 'next' by 2e73ab6
(Documentation/git-worktree: fix incorrect reference to file "locked",
2015-07-20)

> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 566ca92..3fedd9e 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.

Re: [PATCH 1/2] Documentation/git-worktree: fix duplicated 'from'

[Eric Sunshine]

On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt <ps@pks.im> wrote:
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 3387e2f..566ca92 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to
>  $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
>  inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
>
> -To prevent a $GIT_DIR/worktrees entry from from being pruned (which
> +To prevent a $GIT_DIR/worktrees entry from being pruned (which

Thanks. I vaguely recall spotting this repetition when preparing to
move this chunk of text from git-checkout.txt to git-worktree.txt[1],
and planned on fixing it in a follow-on patch (such as [2,3,4,5]), but
forgot about it. For what it's worth (though certainly not necessary
for such an obviously correct path):

Acked-by: Eric Sunshine <sunshine@sunshineco.com>

[1]: 93a3649 (Documentation: move linked worktree description from
checkout to worktree, 2015-07-06)
[2]: 6d3824c (Documentation/git-worktree: add BUGS section, 2015-07-06)
[3]: af189b4 (Documentation/git-worktree: split technical info from
general description, 2015-07-06)
[4]: a8ba5dd (Documentation/git-worktree: add high-level 'lock'
overview, 2015-07-06)
[5]: 9645459 (Documentation/git-worktree: add EXAMPLES section, 2015-07-06)

>  can be useful in some situations, such as when the
>  entry's working tree is stored on a portable device), add a file named
>  'locked' to the entry's directory. The file contains the reason in
> --
> 2.5.0