Tips on integrating vim / vimdiff with Git:

use for 3-way merges

[1]

use for 'git diff'

[1]

doing the same, but for other tools

.vimrc / etc modifications

Real plugins: Smaller stuff: