I've got a set of sand timers (1 to 30 min) to handle such interruptions. Depending on how long it'll take me to finish what I'm working on, I'll just use one of those timers as currency to buy me the couple minutes I need to git commit my way out.