Fix gpl to use --ff-only