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

Re: Rebase, please help

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 11, 2007, 11:32 UTC
Message-ID
<81b0412b0704110432o3f861d4aha68df22f88e59da3@mail.gmail.com>
In-Reply-To
<7vr6qrnszb.fsf@assigned-by-dhcp.cox.net>
On 4/11/07, Junio C Hamano <junkio@cox.net> wrote:
> Also there is that small D/F conflict problem merge-recursive
> has that I told you about, which does not exist in git-apply ;-)
> Did you have a chance to take a look at it yet?
not yet. I was greatly distracted by subprojects
Previous: Junio C Hamano
Message 8 of 8 in “Rebase, please help”
  1. Alexander LitvinovApr 11, 2007
  2. Junio C HamanoApr 11, 2007
  3. Andy ParkinsApr 11, 2007
  4. Junio C HamanoApr 12, 2007
  5. Linus TorvaldsApr 12, 2007
  6. Alex RiesenApr 11, 2007
  7. Junio C HamanoApr 11, 2007
  8. Alex RiesenApr 11, 2007

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.