All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miles Bader <miles@gnu.org>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Deskin Miller <deskinm@umich.edu>, git@vger.kernel.org
Subject: Re: multiple-commit cherry-pick?
Date: Fri, 07 Nov 2008 14:09:07 +0900	[thread overview]
Message-ID: <buozlkcqg0c.fsf@dhapc248.dev.necel.com> (raw)
In-Reply-To: <20081106122658.GB4192@atjola.homenet> ("Björn Steinbrink"'s message of "Thu, 6 Nov 2008 13:26:58 +0100")

Björn Steinbrink <B.Steinbrink@gmx.de> writes:
>> > git reset --hard C
>> > git rebase --onto ORIG_HEAD A^
>> 
>> Is that safe...?  Doesn't git-rebase also set ORIG_HEAD?
>
> One of the first things rebase does is validating and resolving its
> arguments. And that's happening before any actions that would touch
> ORIG_HEAD.

Ah, I see.

Hmm, I guess using rebase --abort isn't a very good idea in this case
though... :-/

Kind of a shame, since it's nice being to just abort the whole operation
if it turns out you did something wrong and aren't sure how to recover.

Thanks,

-Miles

-- 
Kilt, n. A costume sometimes worn by Scotchmen [sic] in America and Americans
in Scotland.

  reply	other threads:[~2008-11-07  5:10 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-06  2:45 multiple-commit cherry-pick? Miles Bader
2008-11-06  3:24 ` Deskin Miller
2008-11-06  9:51   ` Björn Steinbrink
2008-11-06 12:14     ` Miles Bader
2008-11-06 12:26       ` Björn Steinbrink
2008-11-07  5:09         ` Miles Bader [this message]
2008-11-07 11:03           ` Björn Steinbrink
2008-11-07 11:46             ` Miles Bader
2008-11-06 21:37 ` Alex Riesen
2008-11-07  3:29   ` Linus Torvalds
2008-11-07  4:38     ` Miles Bader
2008-11-07  7:13       ` Alex Riesen
2008-11-07  5:00     ` Junio C Hamano
2008-11-07  7:12       ` Alex Riesen
2008-11-07 18:08         ` Linus Torvalds
2008-11-09 10:25           ` Alex Riesen
2008-11-10 19:58             ` Johannes Schindelin
2008-11-10 20:24               ` Alex Riesen
2008-11-10 21:31                 ` Johannes Schindelin
2008-11-14  5:08                   ` Chris Frey
2008-11-14 14:00                     ` Johannes Schindelin
2008-11-14 16:11                     ` Linus Torvalds
2008-11-14 16:59                       ` Johannes Schindelin
2008-11-14 17:29                       ` Junio C Hamano
2008-11-14 17:41                         ` Linus Torvalds
2008-11-14 17:55                           ` Linus Torvalds
2008-11-16  9:11                             ` Pierre Habouzit
2008-11-14 18:38                       ` Francis Galiegue
2008-11-10 20:41               ` Junio C Hamano
2008-11-10 21:34                 ` Johannes Schindelin
2008-11-07 10:46       ` Michael Radziej

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=buozlkcqg0c.fsf@dhapc248.dev.necel.com \
    --to=miles@gnu.org \
    --cc=B.Steinbrink@gmx.de \
    --cc=deskinm@umich.edu \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.