git popclean

If you git stash when you have a bunch of local files that are ignored git stash pop will refuse to un-stash your saved changes. This command cleans that up.

git stash pop 2>&1 | grep already | cut -d' ' -f1 | xargs rm && git stash pop