From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 1/2] RelNotes/2.24.0: typofix
Date: Sat, 02 Nov 2019 14:43:45 +0900 [thread overview]
Message-ID: <xmqqbltu4yum.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <2e1ebe70820fd4cbc40df1f89779c77b9ceea881.1572466878.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Wed, 30 Oct 2019 20:21:17 +0000")
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Elijah Newren <newren@gmail.com>
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> Documentation/RelNotes/2.24.0.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
> index b7083cd6b2..26e018078d 100644
> --- a/Documentation/RelNotes/2.24.0.txt
> +++ b/Documentation/RelNotes/2.24.0.txt
> @@ -316,7 +316,7 @@ Fixes since v2.23
> to access the worktree correctly, which has been corrected.
> (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
>
> - * The merge-recursive machiery is one of the most complex parts of
> + * The merge-recursive machinery is one of the most complex parts of
> the system that accumulated cruft over time. This large series
> cleans up the implementation quite a bit.
> (merge b657047719 en/merge-recursive-cleanup later to maint).
Thanks.
next prev parent reply other threads:[~2019-11-02 5:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 20:21 [PATCH 0/2] 2.24 release note fixups Elijah Newren via GitGitGadget
2019-10-30 20:21 ` [PATCH 1/2] RelNotes/2.24.0: typofix Elijah Newren via GitGitGadget
2019-11-02 3:28 ` Taylor Blau
2019-11-02 5:43 ` Junio C Hamano [this message]
2019-10-30 20:21 ` [PATCH 2/2] RelNotes/2.24.0: fix self-contradictory note Elijah Newren via GitGitGadget
2019-11-02 3:32 ` Taylor Blau
2019-11-02 6:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbltu4yum.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).