From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 07 Sep 2022 16:17:39 GMT
Subject: Re: en/remerge-diff-fixes
Message-ID: <xmqqedwnyx98.fsf@gitster.g>
In-Reply-To: <CABPp-BEX0ScdAvQ1YaPUPNQ197mhcRMEFnHBoJ_0MBTK3nv_DA@mail.gmail.com>

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.