From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Sep 2025, #06; Mon, 15)
Date: Thu, 18 Sep 2025 07:52:11 +0200 [thread overview]
Message-ID: <aMueCwl6hfZRJ_qN@pks.im> (raw)
In-Reply-To: <xmqqv7limi1b.fsf@gitster.g>
On Tue, Sep 16, 2025 at 10:19:44AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > That said, it is not really that big an issue and I am fine with any
> > fix. If you want to document how the history unfolded, then I think an
> > evil merge shows that (neither topic had a problem on its own, but when
> > merged we needed to adjust the result). And it is probably the least
> > amount of work. ;)
>
> That's also fine, too. Let me try that ;-)
Yeah, an evil merge probably is the easiest way, and I see that's what
you did in b501ac6a85 (Merge branch 'ps/odb-clean-stale-wrappers' into
seen, 2025-09-17) now. Thanks!
Patrick
next prev parent reply other threads:[~2025-09-18 5:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 19:19 What's cooking in git.git (Sep 2025, #06; Mon, 15) Junio C Hamano
2025-09-16 6:53 ` Patrick Steinhardt
2025-09-16 16:16 ` Junio C Hamano
2025-09-16 16:49 ` Jeff King
2025-09-16 17:19 ` Junio C Hamano
2025-09-18 5:52 ` Patrick Steinhardt [this message]
2025-09-16 20:54 ` Kristoffer Haugsbakk
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=aMueCwl6hfZRJ_qN@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.