Arriving as the Battle of Gettysburg was winding down, his return was widely celebrated by his men. The popular officer led the division throughout the year, including during the Mine Run Campaign. Griffin participated in most of the major battles of the Army of the Potomac in 1864, including the Overland Campaign and Siege of Petersburg. On December 12, 1864, President Abraham Lincoln nominated Griffin for appointment as a brevet major general of volunteers, to rank from August 1, 1864, and the United States Senate confirmed the appointment on February 14, 1865. Griffin assumed command of V Corps during its final campaign and was present when Robert E. Lee surrendered at Appomattox Court House. In August, he was assigned command of the district of Maine, with his headquarters in Portland. On July 12, 1865, Griffin was appointed major general of volunteers to rank from April 2, 1865. On July 17, 1866, President Andrew Johnson nominated Griffin for appointment as a brevet major general in the regular army, to rank from March 13, 1865, for his service at the Battle of Five Forks and the United States Senate confirmed the appointment on July 23, 1866. Postbellum After the war, Griffin's rank reverted to colonel in the regular army, in command of the 35th U.S. Infantry. He briefly commanded the Department of Maine before being sent west to Galveston, Texas. He served as assistant commissioner of the Freedmen's Bureau for Texas in 1867, serving under Philip H. Sheridan. He became entangled in political issues and registered both black and white voters under the Reconstruction Acts in the spring of that year. He strictly enforced the ironclad oath of allegiance (forcing men to publicly swear that they had never served the Confederacy) as the basis for jury selection. Dissatisfied with the performance of appointed Governor James W. Throckmorton, Griffin persuaded General Sheridan to remove him from office and replace him with a Republican and loyal Unionist, Elisha M. Pease. Together, they used their power and position to remove several Democratic antebellum state officeholders who had supported the Confederacy, replacing them with other Unionists. Griffin was assigned command of the Fifth Military District, replacing Sheridan, and was ordered to report to New Orleans. However, before he could leave for Louisiana and his new headquarters, he died in an epidemic of yellow fever that swept through southeast Texas. He is buried at Oak Hill Cemetery