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

Re: [PATCH v2] rebase -X: do not clobber strategy

From
Thomas Rast <trast@student.ethz.ch>
Date
Nov 11, 2010, 10:41 UTC
Message-ID
<201011111141.33623.trast@student.ethz.ch>
In-Reply-To
<AANLkTiks87caBYo78Xh1hwnEfDF9yKwBn5q3wa87hBo3@mail.gmail.com>
Martin von Zweigbergk wrote:
> Btw, why is the default (if no strategy is specifed) for 'git rebase' to
> use 'recursive', while for 'git merge' "a built-in list of strategies is
> used instead (git merge-recursive when merging a single head, git
> merge-octopus otherwise)"?

Because rebase does a tree-level merge, so it never attempts to merge than one branch, so octopus never enters the picture.

Sorry for the original breakage; while it has Mike Lundy assigned as author, I resurrected and resubmitted his patch and should have noticed.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Previous: Martin von ZweigbergkNext: Martin von Zweigbergk
Message 4 of 8 in “rebase -X: do not clobber strategy”
  1. rebase -X: do not clobber strategyMartin von Zweigbergk, Nov 10, 2010
  2. Sverre RabbelierNov 10, 2010
  3. Martin von ZweigbergkNov 11, 2010
  4. Thomas RastNov 11, 2010
  5. Martin von ZweigbergkNov 11, 2010
  6. Junio C HamanoNov 11, 2010
  7. Martin von ZweigbergkNov 12, 2010
  8. Junio C HamanoNov 12, 2010

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.