Re: multiple-commit cherry-pick?

From: Miles Bader <miles@gnu.org>
Date: Nov 7, 2008, 05:09 UTC
Message-ID: <buozlkcqg0c.fsf@dhapc248.dev.necel.com>
In-Reply-To: <20081106122658.GB4192@atjola.homenet>

Björn Steinbrink <B.Steinbrink@gmx.de> writes:

Show 8 quoted lines

>> > 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.