diff options
Diffstat (limited to 'git-rev-list.html')
| -rw-r--r-- | git-rev-list.html | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 3fa41daf3..68c72896e 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -2866,44 +2866,54 @@ switch line wrapping, like the -w option of </p>
</dd>
<dt class="hdlist1">
-<em>%<(<N>[,trunc|ltrunc|mtrunc])</em>
+<em>%<( <N> [,trunc|ltrunc|mtrunc])</em>
</dt>
<dd>
<p>
make the next placeholder take at
- least N columns, padding spaces on
+ least N column widths, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
- the middle (mtrunc) or the end
- (trunc) if the output is longer than
- N columns. Note that truncating
+ truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
+ the middle (mtrunc) <code>mi..le</code>, or the end
+ (trunc) <code>rig..</code>, if the output is longer than
+ N columns.
+ Note 1: that truncating
only works correctly with N >= 2.
+ Note 2: spaces around the N and M (see below)
+ values are optional.
+ Note 3: Emojis and other wide characters
+ will take two display columns, which may
+ over-run column boundaries.
+ Note 4: decomposed character combining marks
+ may be misplaced at padding boundaries.
</p>
</dd>
<dt class="hdlist1">
-<em>%<|(<N>)</em>
+<em>%<|( <M> )</em>
</dt>
<dd>
<p>
-make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
+make the next placeholder take at least until Mth
+ display column, padding spaces on the right if necessary.
+ Use negative M values for column positions measured
+ from the right hand edge of the terminal window.
</p>
</dd>
<dt class="hdlist1">
-<em>%>(<N>)</em>, <em>%>|(<N>)</em>
+<em>%>( <N> )</em>, <em>%>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em> respectively,
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
but padding spaces on the left
</p>
</dd>
<dt class="hdlist1">
-<em>%>>(<N>)</em>, <em>%>>|(<N>)</em>
+<em>%>>( <N> )</em>, <em>%>>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em>
+similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
@@ -2911,11 +2921,11 @@ similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em> </p>
</dd>
<dt class="hdlist1">
-<em>%><(<N>)</em>, <em>%><|(<N>)</em>
+<em>%><( <N> )</em>, <em>%><|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em>
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
respectively, but padding both sides
(i.e. the text is centered)
</p>
|