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

Re: [PATCH] Stop making git-merge-recur

From
A Large Angry SCM <gitzilla@gmail.com>
Date
Oct 2, 2006, 04:52 UTC
Message-ID
<45209B2A.8070900@gmail.com>
In-Reply-To
<7vu02nz5w6.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
Show 15 quoted lines
> A Large Angry SCM <gitzilla@gmail.com> writes:
> 
>> Git-merge-recur is no longer installed and make clean no longer
>> removes it, so creating making it.
> 
> Thanks for noticing.
> 
> The bug is actually not installing nor cleaning it.  People who
> wanted to stay on the bleeding edge could add "-s recur" on the
> command line, or have "merge.twohead = recur" in the config;
> this is what we actually encouraged people for wider testing.
> We do not suddenly break them.  I planned the removal for the
> release after 1.4.3.
> 
> This should fix it -- could you eyeball it please?
+1
Previous: Junio C Hamano
Message 4 of 4 in “Stop making git-merge-recur”
  1. Stop making git-merge-recurA Large Angry SCM, Oct 2, 2006
  2. A Large Angry SCMOct 2, 2006
  3. Junio C HamanoOct 2, 2006
  4. A Large Angry SCMOct 2, 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.