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

problem with git rebase -i

From
Uwe Kleine-König <uwe.kleine-koenig@digi.com>
Date
Feb 11, 2008, 13:44 UTC
Message-ID
<20080211134448.GA17588@digi.com>
Hello,

I tried to rebase my work (on the Linux kernel) to current Linus' master. As I have two branches I merged them and ran:

	git rebase -i -p v2.6.25-rc1

But then the list I got in my editor didn't include the merge and so the result was broken.

If I add
	pick 913183f
(with 913183f being my HEAD) to the list, the result is correct.

The reason that my merge is missing is that git rev-list thinks my merge is the same as 249d621 and so skips that as it uses --cherry-pick.

Currently I cannot reproduce that with a simple testcase. I don't want to publish my tree now, but I can provide a bundle if someone wants to look into that.

Best regards Uwe

-- 
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
Next: Uwe Kleine-König
Message 1 of 4 in “problem with git rebase -i”
  1. Uwe Kleine-KönigFeb 11, 2008
  2. Uwe Kleine-KönigFeb 13, 2008
  3. Uwe Kleine-KönigFeb 13, 2008
  4. new test: rev-list --cherry-pick excludes an empty commit against a superseding mergeUwe Kleine-König, Feb 13, 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.