Modified .gitconfig: vimdiff + pretty log