Update .gitconfig, and Add diff-highlight