This probably exists but what I really want is a way to keep changes that are not yet commuted with branches they belong to. I know that I can stash but it's no

This probably exists but what I really want is a way to keep changes that are not yet commuted with branches they belong to. I know that I can stash but it's not the same because the stash becomes a mess. I also know that I could commit and later before pushing merge commits together into one that resolves the branch. But it would be hard for me to remember that I did that after switching branches and coming back. What I'm really getting at is, I want a system that records all changes I make and then let's me very selectively choose which of those are pushed to others. Git is definitely the least bad solution now but it's not as seamless as it could be.