The sides avoided arbitration, and the deal was announced Wednesday night.
Gillaspie was a surprise to earn a roster spot out of spring training last season as he began a second stint with San Francisco. Then, he became an unlikely September and playoff star -- as an injury replacement, no less.
He hit a three-run homer off Jeurys Familia in the ninth inning of a 3-0 wild-card win at New York. Gillaspie's catch over the railing and into the photo well in Game 162 against the Dodgers will be remembered, too. Vin Scully called it "superior" in his final broadcast.
Gillaspie would earn an additional $50,000 if he is elected to start in the All-Star Game and $25,000 if he is selected as a reserve. He also would get $50,000 each if he wins a Gold Glove or Sliver Slugger, $75,000 if he is League Championship Series MVP and $100,000 apiece if he is MVP or World Series MVP.