See 'git difftool --tool-help' or 'git help config' for more details. 'git difftool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld kompare gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare vimdiff emerge https://stackoverflow.com/questions/1085162/commit-only-part-of-a-file-in-git/1085191#1085191