I also have this issue. What I do is work in a separate branch and cherry pick commits over to main then rebase. I bet that what you describe could be implemen

I also have this issue. What I do is work in a separate branch and cherry pick commits over to main then rebase. I bet that what you describe could be implemented with stashes and scripts run on hooks, but that feels like fighting the tool too much. There's probably something we're missing?