Git: Keeping the branch in line with the trunk