adding --ff-only to git pull