Rebasing lots of tiny changes