Autogenerated HTML docs for v2.32.0-93-g670b8

1 files changed, 4 insertions, 4 deletions

diff --git a/git-show.html b/git-show.html
index 530a0d3a9..e7c5c308d 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1988,10 +1988,9 @@ diff output.</p></div>
 <dd>

 <p>

         This option makes diff output for merge commits to be shown in

-        the default format. <code>-m</code> will produce the output only if <code>-p</code>

-        is given as well. The default format could be changed using

+        the default format. The default format could be changed using

         <code>log.diffMerges</code> configuration parameter, which default value

-        is <code>separate</code>.

+        is <code>separate</code>. <code>-m</code> implies <code>-p</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2013,7 +2012,8 @@ diff output.</p></div>
 <p>

         This makes merge commits show the full diff with respect to

         each of the parents. Separate log entry and diff is generated

-        for each parent.

+        for each parent. This is the format that <code>-m</code> produced

+        historically.

 </p>

 </dd>

 <dt class="hdlist1">