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

Re: another git rebase -i problem

From
Uwe Kleine-König <uwe.kleine-koenig@digi.com>
Date
Feb 15, 2008, 08:10 UTC
Message-ID
<20080215081046.GA12091@digi.com>
In-Reply-To
<alpine.LSU.1.00.0802141537000.30505@racer.site>
Hallo Johannes,
> Anyway, your "problem" is that you have to say "git rebase --skip", 
> because the patch has been applied to upstream already (but looked 
> differently enough that the patch id was different).
I just noticed that non-interactive rebase fails in that case, too.
In my eyes 
	VISUAL=: git rebase -i ...
should behave exactly as
	git rebase ...

but as this is a corner case that I will probably never run into it's OK for me that it doesn't.

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
Previous: Johannes SchindelinNext: Uwe Kleine-König
Message 5 of 6 in “another git rebase -i problem”
  1. Uwe Kleine-KönigFeb 14, 2008
  2. Johannes SchindelinFeb 14, 2008
  3. Uwe Kleine-KönigFeb 14, 2008
  4. Johannes SchindelinFeb 14, 2008
  5. Uwe Kleine-KönigFeb 15, 2008
  6. Uwe Kleine-KönigFeb 15, 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.