Autogenerated HTML docs for v2.35.1-193-g45fe28

1 files changed, 23 insertions, 6 deletions

diff --git a/git-log.html b/git-log.html
index dcbd7c77c..344112309 100644
--- a/git-log.html
+++ b/git-log.html
@@ -3444,7 +3444,7 @@ the default format.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)

+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)

 </dt>

 <dt class="hdlist1">

 --no-diff-merges

@@ -3509,6 +3509,26 @@ the default format.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--diff-merges=remerge

+</dt>

+<dt class="hdlist1">

+--diff-merges=r

+</dt>

+<dt class="hdlist1">

+--remerge-diff

+</dt>

+<dd>

+<p>

+        With this option, two-parent merge commits are remerged to

+        create a temporary tree object&#8201;&#8212;&#8201;potentially containing files

+        with conflict markers and such.  A diff is then shown between

+        that temporary tree and the actual merge commit.

+</p>

+<div class="paragraph"><p>The output emitted when this option is used is subject to change, and

+so is its interaction with other options (unless explicitly

+documented).</p></div>

+</dd>

+<dt class="hdlist1">

 --diff-merges=combined

 </dt>

 <dt class="hdlist1">

@@ -4432,11 +4452,8 @@ of a delete/create pair.</p></div>
 </p>

 <div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude.  E.g.

 <code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>

-<div class="paragraph"><p>Note that not all diffs can feature all types. For instance, diffs

-from the index to the working tree can never have Added entries

-(because the set of paths included in the diff is limited by what is in

-the index).  Similarly, copied and renamed entries cannot appear if

-detection for those types is disabled.</p></div>

+<div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and

+renamed entries cannot appear if detection for those types is disabled.</p></div>

 </dd>

 <dt class="hdlist1">

 -S&lt;string&gt;