smarter git restore and diff handling

Created by  James Plummer  on August 13, 2025
BMH36OHVL6DAJUXZ7K4HUMLDJ6BZ32IMLMQGZBTZFJK2YLXXH66AC
Change contents