>> >> > git reset --hard C >> >> > git rebase --onto ORIG_HEAD A^ >> 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. I just mean it's not a trivial way to get back to the state before the multi-cherry-pick -- you need to know the details of what's going on, and handle the rest of the cleanup manually. So, for instance, if you were to package up the above commands in a shell script, the abort issue is one of those rough edges which would prevent it from being as convenient as a real git command. [A hypothetical extension of the cherry-pick command to handle multiple commits would presumably offer a "cherry-pick --abort" option that did everything magically.] -Miles -- Do not taunt Happy Fun Ball. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
