Add alias for git-merge, git-merge--no-commit
Merge branch 'master' into mac
Add alias for git-push, git-push--all
Add alias for git-pull
Merge branch 'master' into mac