If I'm about to embark on something where PyCharm's local history isn't enough but I don't have an atomic commit ready, I just use PyCharm's Save to Shelf action. Same as a stash but I mapped it to Ctrl+S when I'm in the commit window. 90% of the time I don't screw it up anyway.