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

Re: [PATCH] rebase-i: keep old parents when preserving merges

From
Stephan Beyer <s-beyer@gmx.net>
Date
Jul 16, 2008, 09:43 UTC
Message-ID
<20080716094301.GA25087@leksak.fem-net>
In-Reply-To
<alpine.DEB.1.00.0807160432480.2841@eeepc-johanness>
Hi,
Johannes Schindelin wrote:
Show 8 quoted lines
> Hi,
> 
> On Wed, 16 Jul 2008, Stephan Beyer wrote:
> 
> > This patch fixes two issues for rebase -i with preserving
> > merges of unrelated branches.
> 
> Two?  What's the second?

Oh, eh, well ;) It's only one bug, but it results in two different behaviors... If you have a merge with more than two parents and not all are lost, then it merges with too few parents. If you have a merge with exactly two parents and one is lost, then it tries to cherry-pick (with an error). "Two" "issues" :)

Regards.
  Stephan
-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 7 in “rebase-i: keep old parents when preserving merges”
  1. rebase-i: keep old parents when preserving mergesStephan Beyer, Jul 16, 2008
  2. Stephan BeyerJul 16, 2008
  3. Johannes SchindelinJul 16, 2008
  4. Stephan BeyerJul 16, 2008
  5. Johannes SchindelinJul 16, 2008
  6. Junio C HamanoJul 16, 2008
  7. Stephan BeyerJul 16, 2008

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.