add git stash aliases
Merge branch 'multiplatform' into mac: git stash aliases