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

Re: [PATCH] Let merge set the default strategy.

From
Junio C Hamano <junkio@cox.net>
Date
Mar 15, 2006, 23:40 UTC
Message-ID
<7vhd5zff9i.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<1142463103-6986-markhollomon@comcast.net>
Mark Hollomon <markhollomon@comcast.net> writes:
> If the user does not set a merge strategy for git-pull,
> let git-merge calculate a default strategy.
Makes lot of sense, thanks.
> This may be preferable to the earlier patch involving
> NO_PYTHON.
Which earlier patch???
Previous: Mark Hollomon
Message 2 of 2 in “Let merge set the default strategy.”
  1. Let merge set the default strategy.Mark Hollomon, Mar 15, 2006
  2. Junio C HamanoMar 15, 2006

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.