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

Re: Re* [PATCH v2] fixup! mergetool: add automerge configuration

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 29, 2021, 00:41 UTC
Message-ID
<xmqqh7n0vakk.fsf@gitster.c.googlers.com>
In-Reply-To
<20210127033714.GA16914@ellen>
Seth House <seth@eseth.com> writes:
> Sorry if it seemed like I left that thread hanging (busy week). Thanks
> for your reply(s). I'm finishing a v10 patchset with that change which
> I'll submit to the list for review this week.
Thanks.
Previous: Seth House
Message 24 of 24 in “fixup! mergetool: add automerge configuration”
  1. fixup! mergetool: add automerge configurationDavid Aguilar, Jan 9, 2021
  2. brian m. carlsonJan 9, 2021
  3. fixup! mergetool: add automerge configurationDavid Aguilar, Jan 9, 2021
  4. Seth HouseJan 9, 2021
  5. Junio C HamanoJan 9, 2021
  6. Junio C HamanoJan 9, 2021
  7. Junio C HamanoJan 10, 2021
  8. Junio C HamanoJan 10, 2021
  9. Re* [PATCH v2] fixup! mergetool: add automerge configurationJunio C Hamano, Jan 10, 2021
  10. Seth HouseJan 10, 2021
  11. Junio C HamanoJan 10, 2021
  12. Seth HouseJan 16, 2021
  13. automerge implementation ideas for WindowsSeth House, Jan 20, 2021
  14. Junio C HamanoJan 21, 2021
  15. Seth HouseJan 22, 2021
  16. Junio C HamanoJan 22, 2021
  17. brian m. carlsonJan 22, 2021
  18. Johannes SchindelinJan 22, 2021
  19. brian m. carlsonJan 22, 2021
  20. Johannes SchindelinJan 26, 2021
  21. Seth HouseJan 26, 2021
  22. Junio C HamanoJan 26, 2021
  23. Seth HouseJan 27, 2021
  24. Junio C HamanoJan 29, 2021

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.