From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: en/remerge-diff-fixes
Date: Wed, 07 Sep 2022 09:17:39 -0700 [thread overview]
Message-ID: <xmqqedwnyx98.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BEX0ScdAvQ1YaPUPNQ197mhcRMEFnHBoJ_0MBTK3nv_DA@mail.gmail.com> (Elijah Newren's message of "Tue, 6 Sep 2022 07:17:31 -0700")
Elijah Newren <newren@gmail.com> writes:
> So, which of the following would you prefer?
> * A separate series for maint and main?
> * Just ignore maint?
> * Me to rebase on maint to tweak the commit message, and then you
> carefully reinstate the line removal as part of the merge back to
> main?
None of them X-<.
As this cycle gets close to end, mergeability to 'maint' starts to
matter less and less, so let's stop worrying about this single
instance.
next prev parent reply other threads:[~2022-09-07 16:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 6:49 What's cooking in git.git (Sep 2022, #01; Mon, 5) Junio C Hamano
2022-09-06 14:17 ` en/remerge-diff-fixes (Was: Re: What's cooking in git.git (Sep 2022, #01; Mon, 5)) Elijah Newren
2022-09-07 16:17 ` Junio C Hamano [this message]
2022-09-07 23:01 ` What's cooking in git.git (Sep 2022, #01; Mon, 5) Glen Choo
2022-09-08 16:57 ` Junio C Hamano
2022-09-09 16:56 ` Glen Choo
-- strict thread matches above, loose matches on Subject: below --
2022-09-09 23:06 What's cooking in git.git (Sep 2022, #02; Fri, 9) Junio C Hamano
2022-09-10 1:26 ` en/remerge-diff-fixes Elijah Newren
2022-09-10 16:40 ` en/remerge-diff-fixes 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=xmqqedwnyx98.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
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).