rebase the hard way