summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-25 17:26:23 -0700
committerJunio C Hamano <gitster@pobox.com>2024-03-25 17:26:23 -0700
commit8842ccc9dc941b70fd8eccbfcd41acac8627f67f (patch)
tree96a88c84fcd5e6707814050b8c611f3cfe07cbae /git-show.html
parentfd4c4dc9f73ff03dad1eb33a5ec51e32dfcb2b4b (diff)
downloadgit-htmldocs-8842ccc9dc941b70fd8eccbfcd41acac8627f67f.tar.gz
Autogenerated HTML docs for v2.44.0-368-gc75fd
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/git-show.html b/git-show.html
index c92ade2d2..cb418c994 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1888,9 +1888,8 @@ multiple times, the last occurrence wins.
</li>
<li>
<p>
-<em>separator=&lt;sep&gt;</em>: specify a separator inserted between trailer
- lines. When this option is not given each trailer line is
- terminated with a line feed character. The string &lt;sep&gt; may contain
+<em>separator=&lt;sep&gt;</em>: specify the separator inserted between trailer
+ lines. Defaults to a line feed character. The string &lt;sep&gt; 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. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>
@@ -1917,10 +1916,9 @@ multiple times, the last occurrence wins.
</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.
+<em>key_value_separator=&lt;sep&gt;</em>: specify the separator inserted between
+ the key and value of each trailer. Defaults to ": ". Otherwise it
+ shares the same semantics as <em>separator=&lt;sep&gt;</em> above.
</p>
</li>
</ul></div>