The Giants can now enter spring training without any contract issues as they have reached an agreement with third baseman Casey McGehee.