Git 2.17 has some really nice diff tweaks: colouring lines that have moved without modification, and even showing context by function rather than just N lines! https://blog.github.com/2018-04-05-git-217-released/