From: Junio C Hamano <junkio@cox.net>
To: Steven Grimm <koreth@midwinter.com>
Cc: git@vger.kernel.org
Subject: Re: Recovering from an aborted git-rebase?
Date: Tue, 09 Jan 2007 16:25:17 -0800 [thread overview]
Message-ID: <7v3b6jiv82.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <45A42341.8040304@midwinter.com> (Steven Grimm's message of "Tue, 09 Jan 2007 15:20:33 -0800")
Steven Grimm <koreth@midwinter.com> writes:
> 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?
next prev parent reply other threads:[~2007-01-10 0:25 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 [this message]
2007-01-10 18:53 ` Steven Grimm
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=7v3b6jiv82.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=koreth@midwinter.com \
/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