git: diff.algorithm = patience

http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/