From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)
Date: Thu, 30 Jan 2025 09:26:42 -0800 [thread overview]
Message-ID: <xmqqtt9gfc19.fsf@gitster.g> (raw)
In-Reply-To: <Z5rkFcp_awa2hjxu@tapette.crustytoothpaste.net> (brian m. carlson's message of "Thu, 30 Jan 2025 02:29:41 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> On 2025-01-28 at 18:26:12, Junio C Hamano wrote:
>> Here is what I'd directly apply to 'next'. The merge-fix mechanism
>> knows about the same change, so when I merge the bc/doc-adoc-not-txt
>> topic down to 'master', the same tweak will be made as an evil
>> merge.
>
> I agree that seems like the right solution.
Thanks.
next prev parent reply other threads:[~2025-01-30 17:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-24 20:19 What's cooking in git.git (Jan 2025, #07; Fri, 24) Junio C Hamano
2025-01-28 16:46 ` Jeff King
2025-01-28 17:59 ` Junio C Hamano
2025-01-28 18:26 ` Junio C Hamano
2025-01-29 6:03 ` Jeff King
2025-01-30 2:29 ` brian m. carlson
2025-01-30 17:26 ` Junio C Hamano [this message]
2025-01-29 13:40 ` Derrick Stolee
2025-01-29 15:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtt9gfc19.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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.
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 NNTP newsgroup(s).