Rebase a branch into master