You don’t have to comb through the reflog for the pre-rebase branch state. Use `@{1}` from the reflog of the branch (not `HEAD`).[1] Note: First I thought tha

You don’t have to comb through the reflog for the pre-rebase branch state. Use `@{1}` from the reflog of the branch (not `HEAD`).[1] Note: First I thought that `ORIG_HEAD` was the thing. But that won’t work if you did `git reset` during the rebase. (`ORIG_HEAD` is probably “original head”, not “origin head” (like the remote) that I first thought…) [1] You just have to comb through documentation!