joachim

@QuazarOmega I don’t know for sure, sorry. Like someone said on that link, the reflog should have a record, but you’ll need to either abort the rebase and then pick out the right commit, or forcibly kill git’s tracking of the rebase operation. When I know a rebase is going to be long and complicated, I’ll break it down into multiple rebases.

@QuazarOmega I always do git branch tmp before doing a rebase, to have a backup. Also useful for checking nothing got lost in conflict resolution. #git