Elijah Newren <newren@xxxxxxxxx> writes: > diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt > index 231105cff4..69cb3b0349 100644 > --- a/Documentation/diff-generate-patch.txt > +++ b/Documentation/diff-generate-patch.txt > @@ -144,6 +144,19 @@ Similar to two-line header for traditional 'unified' diff > format, `/dev/null` is used to signal created or deleted > files. > > +However, if the --combined-all-paths option is provided, instead of a > +two-line from-file/to-file you get a N+1 line from-file/to-file header, > +where N is the number of parents in the merge commit > + > + --- a/file > + --- a/file > + --- a/file > + +++ b/file > ++ > +This extended format can be useful if rename or copy detection is > +active, to allow you to see the original name of the file in different > +parents. > + > 4. Chunk header format is modified to prevent people from > accidentally feeding it to `patch -p1`. Combined diff format > was created for review of merge commit changes, and was not You need to replace the blank line before the new paragraph that begins with "However" with a line with a single "+" on it, to tell the formatter that the new text is still part of the third item in the list.
