Comment by stormbrew

    git diff --patience

might give you better results? I've seen this pattern too, but I can't find a reproduction of normal git diff giving it to me at the moment.