On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- > Documentation/diff-options.txt | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index c89d530d3d1..b05f1c9f1c9 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -64,6 +64,14 @@ ifdef::git-log[] > each of the parents. Separate log entry and diff is generated > for each parent. > + > +--diff-merges=remerge::: > +--diff-merges=r::: > +--remerge-diff::: > + With this option, two-parent merge commits are remerged to > + create a temporary tree object -- potentially containing files > + with conflict markers and such. A diff is then shown between > + that temporary tree and the actual merge commit. > ++ > --diff-merges=combined::: > --diff-merges=c::: > -c::: This & 5/9 would I think be better squashed into their respective "main" patches.
