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

en/remerge-diff-fixes

From
Elijah Newren <newren@gmail.com>
Date
Sep 10, 2022, 01:26 UTC
Message-ID
<CABPp-BG3jqJXjAWaZPZr6nO=U2oBRae-cHajc8-zbkpehURzrg@mail.gmail.com>
In-Reply-To
<xmqq5yhwi1vw.fsf@gitster.g>
Hi,
On Fri, Sep 9, 2022 at 6:07 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
>
> * en/remerge-diff-fixes (2022-09-02) 3 commits
>  - diff: fix filtering of merge commits under --remerge-diff
>  - diff: fix filtering of additional headers under --remerge-diff
>  - diff: have submodule_format logic avoid additional diff headers
>
>  Fix a few "git log --remerge-diff" bugs.
>
>  Will probably need to rebase to make it mergeable to 'maint'.

Is this last sentence stale? After the last "What's cooking" you said not to worry about this[1].

[1] https://lore.kernel.org/git/xmqqedwnyx98.fsf@gitster.g/
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 6 in “What's cooking in git.git (Sep 2022, #02; Fri, 9)”
  1. Junio C HamanoSep 9, 2022
  2. en/remerge-diff-fixesElijah Newren, Sep 10, 2022
  3. Junio C HamanoSep 10, 2022
  4. Jeff KingSep 11, 2022
  5. Junio C HamanoSep 12, 2022
  6. Jeff KingSep 12, 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.