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

Rebase, please help

From
ALAlexander Litvinov <litvinov2004@gmail.com>
Date
Apr 11, 2007, 01:52 UTC
Message-ID
<200704110852.00540.litvinov2004@gmail.com>
Hello list.

I have found that rebase have (new) option : --merge Looking at the code show me that regular rebase is a simply format-patch and am but --merge (or -s) use some merge stratyegy to merge changes between two commits into current head.

What is --merge for ? Will the result be the same ?
Next: Junio C Hamano
Message 1 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.