rebase is a thing, and requires more convenient aliases