Zach Holman gives more Git and GitHub tricks in this presentation, it’s worth the read if for nothing other than the patience merge strategy on slide 23. If you want to set that as a global option, you can use the following command:

git config --global diff.algorithm patience

Other gems include, not using less as your default diff viewer (use cat and you get emoji!). Here’s the command to set that globally:

git config --global core.pager cat