@b0rk Unsure if this is best practice or a horrible hack, but if I'm going to do something complicated with a branch I always create a backup first. Branches are cheap, so if you do "git branch backup" before your risky rebase, you can always get back to where you started. All without playing with the reflog.