Branch branch branch and then rebase a Git workflow