I actually had the same pain point - so to address - built a code generator specifically around the "undo" functionality: it takes snapshots before making any updates, and then you can "restore" right from a tool with a single command: no need for manual git invocation. Literally, just a single "restore" command:

https://github.com/acrotron/aye-chat