I think you can /commit through aider and still undo it, but I'm not certain.

I use no-auto-commits