SCOTTSDALE, Ariz. -- Versatile infielder Aaron Hill has agreed to a minor league contract with the San Francisco Giants and would get a $2 million, one-year deal if he is added to the 40-man roster.