Comment by jharger

Except fixing the rebase issue isn't usually that difficult, if you know about reflog.