stash pop (git alias)
taterge branch 'linux' of github.com:myun2/my_env into linux

Conflicts:
	aliases/git