From: Steven Grimm <koreth@midwinter.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Recovering from an aborted git-rebase?
Date: Wed, 10 Jan 2007 10:53:31 -0800 [thread overview]
Message-ID: <45A5362B.3030204@midwinter.com> (raw)
In-Reply-To: <7v3b6jiv82.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Doesn't "git rebase --abort" work for you at this point?
It probably would have, but he ran another "git rebase" immediately
after hitting ctrl-C, not realizing that the interrupted one had left
things in an odd state. I tried --abort after the fact and it said there
was no rebase in progress; I assume the second rebase wiped out the
temporary state from the first one.
However, all's well; Shawn's suggestion of using the reflog worked fine.
We were able to reset back to HEAD@{3 hours ago} then do the rebase
again, and it did the right thing. Even though we had a filesystem
snapshot to fall back on, needless to say we were very happy to see
there was a way to recover using nothing but git commands.
Hooray for the reflog being turned on by default!
-Steve
prev parent reply other threads:[~2007-01-10 18:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 23:20 Recovering from an aborted git-rebase? Steven Grimm
2007-01-09 23:29 ` Shawn O. Pearce
2007-01-10 0:25 ` Junio C Hamano
2007-01-10 18:53 ` Steven Grimm [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45A5362B.3030204@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox