git diff --patience for the win