GIT_EXTERNAL_DIFF lets you use emacs as your diff tool.

http://stackoverflow.com/questions/255202/how-do-i-view-git-...