Autogenerated HTML docs for v2.30.0-81-g72c40

1 files changed, 27 insertions, 15 deletions

diff --git a/git-show.html b/git-show.html
index badbc6911..a66789c0c 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1744,8 +1744,14 @@ display the trailers of the body as
                           interpreted by

                           <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The

                           <code>trailers</code> string may be followed by a colon

-                          and zero or more comma-separated options:

-</p>

+                          and zero or more comma-separated options.

+                          If any option is provided multiple times the

+                          last occurance wins.

+</p>

+<div class="paragraph"><p>The boolean options accept an optional value <code>[=&lt;BOOL&gt;]</code>. The values

+<code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"

+sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean

+option is given with no value, it&#8217;s enabled.</p></div>

 <div class="ulist"><ul>

 <li>

 <p>

@@ -1761,12 +1767,8 @@ display the trailers of the body as
 </li>

 <li>

 <p>

-<em>only[=val]</em>: select whether non-trailer lines from the trailer

-   block should be included. The <code>only</code> keyword may optionally be

-   followed by an equal sign and one of <code>true</code>, <code>on</code>, <code>yes</code> to omit or

-   <code>false</code>, <code>off</code>, <code>no</code> to show the non-trailer lines. If option is

-   given without value it is enabled. If given multiple times the last

-   value is used.

+<em>only[=&lt;BOOL&gt;]</em>: select whether non-trailer lines from the trailer

+   block should be included.

 </p>

 </li>

 <li>

@@ -1776,24 +1778,34 @@ display the trailers of the body as
    terminated with a line feed character. The string SEP may contain

    the literal formatting codes described above. To use comma as

    separator one must use <code>%x2C</code> as it would otherwise be parsed as

-   next option. If separator option is given multiple times only the

-   last one is used. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>

+   next option. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>

    shows all trailer lines whose key is "Ticket" separated by a comma

    and a space.

 </p>

 </li>

 <li>

 <p>

-<em>unfold[=val]</em>: make it behave as if interpret-trailer&#8217;s <code>--unfold</code>

-   option was given. In same way as to for <code>only</code> it can be followed

-   by an equal sign and explicit value. E.g.,

+<em>unfold[=&lt;BOOL&gt;]</em>: make it behave as if interpret-trailer&#8217;s <code>--unfold</code>

+   option was given. E.g.,

    <code>%(trailers:only,unfold=true)</code> unfolds and shows all trailer lines.

 </p>

 </li>

 <li>

 <p>

-<em>valueonly[=val]</em>: skip over the key part of the trailer line and only

-   show the value part. Also this optionally allows explicit value.

+<em>keyonly[=&lt;BOOL&gt;]</em>: only show the key part of the trailer.

+</p>

+</li>

+<li>

+<p>

+<em>valueonly[=&lt;BOOL&gt;]</em>: only show the value part of the trailer.

+</p>

+</li>

+<li>

+<p>

+<em>key_value_separator=&lt;SEP&gt;</em>: specify a separator inserted between

+   trailer lines. When this option is not given each trailer key-value

+   pair is separated by ": ". Otherwise it shares the same semantics

+   as <em>separator=&lt;SEP&gt;</em> above.

 </p>

 </li>

 </ul></div>