[jldugger]

git-extras has a tool called `git undo`. It's just a fancy wrapper around `git reset --soft HEAD` though.

[UweSchmidt]

Well you never know what these wrappers and aliases do, and ultimately need to understand what goes on under the hood.

Intellij has a "shelve" command, I decided to stick with "git stash". Magit has the "i", that does "ignore" but also cleans up already committed files, something like "git rm -r --cached ."