git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: en/remerge-diff-fixes

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 7, 2022, 16:17 UTC
Message-ID
<xmqqedwnyx98.fsf@gitster.g>
In-Reply-To
<CABPp-BEX0ScdAvQ1YaPUPNQ197mhcRMEFnHBoJ_0MBTK3nv_DA@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 6 quoted lines
> 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.

Previous: Elijah NewrenNext: Glen Choo
Message 3 of 6 in “What's cooking in git.git (Sep 2022, #01; Mon, 5)”
  1. Junio C HamanoSep 6, 2022
  2. en/remerge-diff-fixes (Was: Re: What's cooking in git.git (Sep 2022, #01; Mon, 5))Elijah Newren, Sep 6, 2022
  3. Junio C HamanoSep 7, 2022
  4. Glen ChooSep 7, 2022
  5. Junio C HamanoSep 8, 2022
  6. Glen ChooSep 9, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.