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

Re: [PATCH 0/2] Switch default merge backend from recursive to ort

From
Derrick Stolee <stolee@gmail.com>
Date
Aug 4, 2021, 14:27 UTC
Message-ID
<19187114-4a91-19b8-7c41-407a4a661f41@gmail.com>
In-Reply-To
<pull.1011.git.1628055482.gitgitgadget@gmail.com>
On 8/4/2021 1:38 AM, Elijah Newren via GitGitGadget wrote:
Show 14 quoted lines
> This is a reroll of my RFC series[1] to switch the default merge backend
> from recursive to ort. The consensus seems to be that we should do this
> immediately after the 2.33 release.
> 
> Note that folks who want to get the old merge backend after this series can
> simply set pull.twohead=recursive. (And, similarly, before this series,
> those who want to try out ort in Git 2.32 or Git 2.33 can set
> pull.twohead=ort.)
> 
> Changes since the RFC version of this series:
> 
>  * Now depends on the reroll of en/merge-strategy-docs I just submitted[2].
>  * Made tweaks to code and documentation suggested by Stolee, Dscho, and
>    Ævar

I'm happy with this version (modulo a super tiny nitpick that doesn't merit a re-roll) and the docs that preceded it. I'm going to adapt my version for the microsoft/git fork to take this version and put it in our v2.33.0 release.

Thanks, -Stolee

Previous: Elijah Newren
Message 7 of 7 in “Switch default merge backend from recursive to ort”
  1. 0/2 Switch default merge backend from recursive to ortElijah Newren via GitGitGadget, Aug 4, 2021
  2. 2/2 Update docs for change of default merge backendElijah Newren via GitGitGadget, Aug 4, 2021
  3. Derrick StoleeAug 4, 2021
  4. 1/2 Change default merge backend from recursive to ortElijah Newren via GitGitGadget, Aug 4, 2021
  5. Phillip WoodAug 9, 2021
  6. Elijah NewrenAug 9, 2021
  7. Derrick StoleeAug 4, 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.