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

Re: [PATCH] Use resolve in git-pull if NO_PYTHON

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 14, 2006, 17:26 UTC
Message-ID
<Pine.LNX.4.63.0603141825200.22344@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<1142356355-4772-markhollomon@comcast.net>
Hi,
On Tue, 14 Mar 2006, Mark Hollomon wrote:
> git-pull is hardcoded to use the recursive merge strategy
> for the twohead case. But if git has been built with NO_PYTHON,
> that strategy is not available. Teach git-pull to use resolve
> if built with NO_PYTHON.

D'oh. I forgot to send that patch when I was doing the NO_PYTHON stuff. But I did it differently: There is no good reason that git-pull should insist on its own default strategy when git-merge already has one.

Ciao, Dscho

Previous: Mark Hollomon
Message 2 of 2 in “Use resolve in git-pull if NO_PYTHON”
  1. Use resolve in git-pull if NO_PYTHONMark Hollomon, Mar 14, 2006
  2. Johannes SchindelinMar 14, 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.