Re: multiple-commit cherry-pick?

On 2008.11.07 14:09:07 +0900, Miles Bader wrote:

Björn Steinbrink [off-list ref] writes:

quoted

quoted

quoted

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

Why not? I mean, ok, you end up at C, and not where you have been before
the reset --hard, but there's the reflog to help you get back to
whatever previous state of the branch it is that you want.

Björn