git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)