This is my basic .gitconfig file

Note that I'm using meld as diff and merge tool. I have to have meld installed and the git-meld script in order for meld to work. The git-meld is there to wrap the git commands to meld so that it works properly.