diff options
Diffstat (limited to 'git-diff-tree.html')
| -rw-r--r-- | git-diff-tree.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index bdaf0a8b0..725398b78 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -3324,9 +3324,8 @@ multiple times, the last occurrence wins. </li>
<li>
<p>
-<em>separator=<sep></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 <sep> may contain
+<em>separator=<sep></em>: specify the separator inserted between trailer
+ lines. Defaults to 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. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>
@@ -3353,10 +3352,9 @@ multiple times, the last occurrence wins. </li>
<li>
<p>
-<em>key_value_separator=<sep></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=<sep></em> above.
+<em>key_value_separator=<sep></em>: specify the separator inserted between
+ the key and value of each trailer. Defaults to ": ". Otherwise it
+ shares the same semantics as <em>separator=<sep></em> above.
</p>
</li>
</ul></div>
|