I use a modified version of vimdiff as my daily diff tool: https://gist.github.com/PhilipRoman/60066716b5fa09fcabfa6c95eaf7d170 https://gist.github.com/PhilipRo

I use a modified version of vimdiff as my daily diff tool: https://gist.github.com/PhilipRoman/60066716b5fa09fcabfa6c95eaf7d170 https://gist.github.com/PhilipRoman/60066716b5fa09fcabfa6c95... I find it easier to navigate that way since the diff of each file is in its own tab (yes I know... not how tabs are meant to be used) For grep, vim's built in location list seems good enough. As for blame, I haven't used it since learning about git log -L. Vastly superior in my opinion.