Jakub Narebski <jnareb@xxxxxxxxx> writes: > ... But for gitweb more important than producing safe patch > is producing _readable_ patch[*1*]. Hence request for -T option > (or under other, better name) to git-diff which would _not_ > split patch (not create two patches for one raw difftree line). > > [*1*] Well, as far as diff for symlink is readable anyway. Honestly, I do not have strong feeling either way. As you say, I suspect diff to change between symlink and regular file is not readable no matter how you present it, and it is a corner case that is not very interesting. It happens in real life but it is rare enough that split patches or a single patch would not make much difference either way. So I would not oppose to a patch to add an option to update git-diff to produce either format, but I doubt it is worth the effort required to make sure that the change does not break anything else and also to make matching adjustment to git-apply, so that it can understand both formats. >> I am not sure what you mean by patchset part, but if you are >> talking about the multiway diff text, I think most of the time >> output from "-c -p" is much less interesting than "--cc". > > Sorry, perhaps I was not clear. I'd like for git-diff-tree --cc > --raw -p to output both raw part (perhaps taken from -c) and > patch part... I can see why somebody might want to do this, to exactly the same degree that I can see why somebody might want to use the combination of "--raw -p". I think this would work in git.git itself: git diff-tree --cc --numstat --raw -p v1.0.0 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html