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

Re: What's cooking in git.git (Oct 2023, #03; Fri, 6)

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Oct 9, 2023, 09:59 UTC
Message-ID
<02cf1135-d330-4f0b-aa43-4a555f34adfc@gmail.com>
In-Reply-To
<xmqqh6n24zf1.fsf@gitster.g>
On 07/10/2023 09:20, Junio C Hamano wrote:
Show 9 quoted lines
> * ty/merge-tree-strategy-options (2023-09-25) 1 commit
>    (merged to 'next' on 2023-09-29 at aa65b54416)
>   + merge-tree: add -X strategy option
> 
>   "git merge-tree" learned to take strategy backend specific options
>   via the "-X" option, like "git merge" does.
> 
>   Will merge to 'master'.
>   source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>

We may want to hold off on this as there is a wierd copy-by-value of struct merge-options cf <a482d047-dd40-436d-8daa-0c74780af11f@gmail.com>

Best Wishes
Phillip
Previous: René ScharfeNext: Taylor Blau
Message 5 of 10 in “What's cooking in git.git (Oct 2023, #03; Fri, 6)”
  1. Junio C HamanoOct 7, 2023
  2. René ScharfeOct 8, 2023
  3. Junio C HamanoOct 9, 2023
  4. René ScharfeOct 28, 2023
  5. Phillip WoodOct 9, 2023
  6. Taylor BlauOct 9, 2023
  7. Junio C HamanoOct 9, 2023
  8. Taylor BlauOct 9, 2023
  9. Junio C HamanoOct 9, 2023
  10. Taylor BlauOct 10, 2023

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.