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

Re: [PATCH 0/3] Fixups for cw/submodule-merge-messages

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 17, 2022, 05:37 UTC
Message-ID
<xmqqk0771lcb.fsf@gitster.g>
In-Reply-To
<pull.1325.git.1660696081.gitgitgadget@gmail.com>
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> (Note that my first patch builds on Junio's patch-on-top, though it kind of
> obviates the need for his patch. Let me know if you want me to rebase
> directly on Calvin's patch and remove the need for your patch, Junio.)

It paid off that I didn't merge the leakfix to 'next' ;-) Please just tell me to drop the patch and build on top of what Calvin has in 'next' directly.

Thanks.
Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren via GitGitGadget
Message 5 of 16 in “Fixups for cw/submodule-merge-messages”
  1. 0/3 Fixups for cw/submodule-merge-messagesElijah Newren via GitGitGadget, Aug 17, 2022
  2. 1/3 merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren via GitGitGadget, Aug 17, 2022
  3. 2/3 merge-ort: add comment to avoid surprise with new sub_flag variableElijah Newren via GitGitGadget, Aug 17, 2022
  4. 3/3 merge-ort: provide helpful submodule update message when possibleElijah Newren via GitGitGadget, Aug 17, 2022
  5. Junio C HamanoAug 17, 2022
  6. 0/3 Fixups for cw/submodule-merge-messagesElijah Newren via GitGitGadget, Aug 17, 2022
  7. 1/3 merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren via GitGitGadget, Aug 17, 2022
  8. 2/3 merge-ort: add comment to avoid surprise with new sub_flag variableElijah Newren via GitGitGadget, Aug 17, 2022
  9. Junio C HamanoAug 17, 2022
  10. Elijah NewrenAug 18, 2022
  11. 3/3 merge-ort: provide helpful submodule update message when possibleElijah Newren via GitGitGadget, Aug 17, 2022
  12. Junio C HamanoAug 17, 2022
  13. 0/3 Fixups for cw/submodule-merge-messagesElijah Newren via GitGitGadget, Aug 18, 2022
  14. 1/3 merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren via GitGitGadget, Aug 18, 2022
  15. 2/3 merge-ort: avoid surprise with new sub_flag variableElijah Newren via GitGitGadget, Aug 18, 2022
  16. 3/3 merge-ort: provide helpful submodule update message when possibleElijah Newren via GitGitGadget, Aug 18, 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.