subl -> mate
Always use homebrew's version of git
Merge remote-tracking branch 'origin/master'