adding aliases
showing merge status
git diff wrapper
adding zsh