git config uses osx credentials / modified merge style
 pimped up which