Change git pull to ff-only to avoid unnecessary merges.