That’s what git-rebase is for, and it is built into standard git.