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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt <ps@xxxxxx> wrote:
> Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
> ---
> 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@xxxxxxxxxxxxxx>

[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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]