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

Re: rebase problems

From
SVSven Verdoolaege <skimo@kotnet.org>
Date
Nov 28, 2005, 20:24 UTC
Message-ID
<20051128202428.GA8383MdfPADPa@greensroom.kotnet.org>
In-Reply-To
<7v4q5wttib.fsf@assigned-by-dhcp.cox.net>
On Mon, Nov 28, 2005 at 12:19:40PM -0800, Junio C Hamano wrote:
Show 5 quoted lines
> The output seems very inconsistent I am not sure why the first
> message says "Applying HEAD~2", not HEAD~6.    What patches do
> you see in .dotest/ directory, and are they numbered in the
> right order?  HEAD~6 should be numbered 0001 and that should be
> the first one that was applied.

Ah! It seems .dotest still contained some stuff from a previous (expectedly) failed rebase.

Rebase worked after rm -rf'ing .dotest

Maybe rebase should clean up .dotest or at least warn about an existing .dotest ?

Thanks, skimo

Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 4 in “rebase problems”
  1. Sven VerdoolaegeNov 28, 2005
  2. Junio C HamanoNov 28, 2005
  3. Sven VerdoolaegeNov 28, 2005
  4. Junio C HamanoNov 28, 2005

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.