Reorder and add git aliases
Fix stashpop to not proceed on failure