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

[PATCH v4 0/1] merge-recursive: give notice when submodule commit gets fast-forwarded

From
Leif Middelschulte <leif.middelschulte@gmail.com>
Date
Jun 4, 2018, 18:48 UTC
Message-ID
<20180604184805.36332-1-leif.middelschulte@gmail.com>
In-Reply-To
<xmqqk1s474vx.fsf@gitster-ct.c.googlers.com>
From: Leif Middelschulte <Leif.Middelschulte@gmail.com>

The provided patch is in response to Elijah Newren's [0] and Junio Hamano's [1] comments on my prior patch regarding the reasoning and implementation of a user notification during (clean) merges of submodules.

[0] https://public-inbox.org/git/xmqqo9hg7554.fsf@gitster-ct.c.googlers.com/#t [1] https://public-inbox.org/git/xmqqzi0t1waf.fsf@gitster-ct.c.googlers.com/

Leif Middelschulte (1):
  Inform about Auto-merging of submodules during merge
 merge-recursive.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
-- 
2.15.1 (Apple Git-101)
Previous: Junio C HamanoNext: Leif Middelschulte
Message 9 of 19 in “[PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive”
  1. Stefan BellerMay 15, 2018
  2. git-submodule.sh: try harder to fetch a submoduleStefan Beller, May 15, 2018
  3. 2/3 merge-recursive: i18n submodule merge output and respect verbosityStefan Beller, May 15, 2018
  4. Junio C HamanoMay 16, 2018
  5. 3/3 Inform about fast-forwarding of submodules during mergeStefan Beller, May 15, 2018
  6. Elijah NewrenMay 16, 2018
  7. Junio C HamanoMay 16, 2018
  8. Junio C HamanoMay 16, 2018
  9. 0/1 merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte, Jun 4, 2018
  10. 1/1 merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte, Jun 4, 2018
  11. Elijah NewrenJun 7, 2018
  12. merge-submodule: reduce output verbosityLeif Middelschulte, Jun 11, 2018
  13. Junio C HamanoJun 11, 2018
  14. Leif MiddelschulteJun 11, 2018
  15. grep: handle corrupt index files earlyStefan Beller, May 15, 2018
  16. 1/3 submodule.c: move submodule merging to merge-recursive.cStefan Beller, May 15, 2018
  17. Stefan BellerMay 15, 2018
  18. Leif MiddelschulteMay 15, 2018
  19. Stefan BellerMay 15, 2018

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.