Git and Vimdiff
Vimdiff is my favourite diff tool. I’ve used many others, but I always come back to good old vimdiff
. Git comes with git diff
(man page: man git-diff
) which shows the changes between various things Git knows about -- it's possible to show the changes between the working tree and the index, changes…