Merge gitconfig changes, including fancy log alias
:retab the .gitconfig