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

Re: Recovering from an aborted git-rebase?

From
Junio C Hamano <junkio@cox.net>
Date
Jan 10, 2007, 00:25 UTC
Message-ID
<7v3b6jiv82.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<45A42341.8040304@midwinter.com>
Steven Grimm <koreth@midwinter.com> writes:
Show 7 quoted lines
> dev005:~/www-git$ git rebase master
> First, rewinding head to replay your work on top of it...
> HEAD is now at a5074e5... Fix IE6 display bug on photo_comments
> *********
> at this point I think to myself "oops, I meant to rebase to fql, not to
> master" and press ctrl+c
> *********
Doesn't "git rebase --abort" work for you at this point?
Previous: Shawn O. PearceNext: Steven Grimm
Message 3 of 4 in “Recovering from an aborted git-rebase?”
  1. Steven GrimmJan 9, 2007
  2. Shawn O. PearceJan 9, 2007
  3. Junio C HamanoJan 10, 2007
  4. Steven GrimmJan 10, 2007

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.