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, 07:48 UTC
Message-ID
<81b0412b0704110048j30193650r6a7e7417a9afeaf8@mail.gmail.com>
In-Reply-To
<200704110852.00540.litvinov2004@gmail.com>
On 4/11/07, Alexander Litvinov <litvinov2004@gmail.com> wrote:
>
> What is --merge for ? Will the result be the same ?

Maybe, maybe not. It uses merge strategies instead of git-am and has advantages over blindly applying the patches (it can know how a change got in, and it uses resolved conflict cache).

Previous: Linus TorvaldsNext: Junio C Hamano
Message 6 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.