summaryrefslogtreecommitdiffstats
path: root/git-rev-list.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-rev-list.html')
-rw-r--r--git-rev-list.html18
1 files changed, 8 insertions, 10 deletions
diff --git a/git-rev-list.html b/git-rev-list.html
index d8c4450cd..71ef8c4d6 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1328,15 +1328,15 @@ list.</p></div>
<div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
this causes the output to have two extra lines of information
taken from the reflog. The reflog designator in the output may be shown
-as <code>ref@{Nth}</code> (where <code>Nth</code> is the reverse-chronological index in the
-reflog) or as <code>ref@{timestamp}</code> (with the timestamp for that entry),
+as <code>ref@{&lt;Nth&gt;}</code> (where <em>&lt;Nth&gt;</em> is the reverse-chronological index in the
+reflog) or as <code>ref@{&lt;timestamp&gt;}</code> (with the <em>&lt;timestamp&gt;</em> for that entry),
depending on a few rules:</p></div>
<div class="openblock">
<div class="content">
<div class="olist arabic"><ol class="arabic">
<li>
<p>
-If the starting point is specified as <code>ref@{Nth}</code>, show the index
+If the starting point is specified as <code>ref@{&lt;Nth&gt;}</code>, show the index
format.
</p>
</li>
@@ -3534,9 +3534,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>
@@ -3563,10 +3562,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>