Howto use vimdiff as "git diff"'s diff tool

First, make sure your git version is higher than 1.6.3

Then:

git config --global diff.tool vimdiff

git config --global difftool.vimdiff.cmd "vimdiff" 

git config --global difftool.prompt false 

That's OK. Next time, use "git difftool ..." replace "git diff ..."

To view all your global settings:  git config --global --list

To remove one setting from global:  git config --global --unset <setting name>