Autogenerated HTML docs for v2.31.1-442-g7e391

1 files changed, 25 insertions, 10 deletions

diff --git a/git-log.html b/git-log.html
index 78a53414d..64e863173 100644
--- a/git-log.html
+++ b/git-log.html
@@ -3408,7 +3408,7 @@ the default format.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---diff-merges=(off|none|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)

 </dt>

 <dt class="hdlist1">

 --no-diff-merges

@@ -3433,6 +3433,24 @@ the default format.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--diff-merges=on

+</dt>

+<dt class="hdlist1">

+--diff-merges=m

+</dt>

+<dt class="hdlist1">

+-m

+</dt>

+<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

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

+        is <code>separate</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --diff-merges=first-parent

 </dt>

 <dt class="hdlist1">

@@ -3447,17 +3465,11 @@ the default format.</p></div>
 <dt class="hdlist1">

 --diff-merges=separate

 </dt>

-<dt class="hdlist1">

---diff-merges=m

-</dt>

-<dt class="hdlist1">

--m

-</dt>

 <dd>

 <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. <code>-m</code> doesn&#8217;t produce any output without <code>-p</code>.

+        for each parent.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3872,7 +3884,9 @@ explained for the configuration variable <code>core.quotePath</code> (see
 </dt>

 <dd>

 <p>

-        Show only names of changed files.

+        Show only names of changed files. The file names are often encoded in UTF-8.

+        For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>

+        manual page.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3882,6 +3896,7 @@ explained for the configuration variable <code>core.quotePath</code> (see
 <p>

         Show only names and status of changed files. See the description

         of the <code>--diff-filter</code> option on what the status letters mean.

+        Just like <code>--name-only</code> the file names are often encoded in UTF-8.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -5279,7 +5294,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-05 17:34:58 PST

+ 2021-02-06 10:34:58 JST

 </div>

 </div>

 </body>