Jakub Narębski <jnareb@xxxxxxxxx> writes: > Side note: I wonder if the cousin of unified diff, namely context diff[1], > is something that we can and should support. Yes, the lack of support for the copied context (instead of the unified context) diff format has bugged me over the years. Reading copied context diff format however is rapidly becoming a lost art, unfortunately, partly due to our popularity, and the need for the format has become a lessor issue. I wonder if a pair of a pre-processor (on the input side, before running 'git apply') and a post-processor (on the output side, munging the output from 'git show/diff') would be sufficient. In any case, I agree with you that it has nothing to do with what Stefan is doing here.