Skip to content

Commit 8bcb8f8

Browse files
PhilipOakleygitster
authored andcommitted
doc: pretty-formats: delineate %<|( parameter values
Commit a575234 (pretty: support padding placeholders, %< %> and %><, 2013-04-19) introduced column width place holders. It also added separate column position `%<|(` placeholders for display screen based placement. Change the display screen parameter reference from 'N' to 'M' and corresponding descriptives to make the distinction clearer. Signed-off-by: Philip Oakley <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d664a7a commit 8bcb8f8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Documentation/pretty-formats.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,26 +147,26 @@ The placeholders are:
147147
'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
148148
linkgit:git-shortlog[1].
149149
'%<( <N> [,trunc|ltrunc|mtrunc])':: make the next placeholder take at
150-
least N columns, padding spaces on
150+
least N column widths, padding spaces on
151151
the right if necessary. Optionally
152152
truncate at the beginning (ltrunc),
153153
the middle (mtrunc) or the end
154154
(trunc) if the output is longer than
155155
N columns.
156156
Note 1: that truncating
157157
only works correctly with N >= 2.
158-
Note 2: spaces around the N
158+
Note 2: spaces around the N and M (see below)
159159
values are optional.
160-
'%<|( <N> )':: make the next placeholder take at least until Nth
161-
columns, padding spaces on the right if necessary
162-
'%>( <N> )', '%>|( <N> )':: similar to '%<( <N> )', '%<|( <N> )' respectively,
160+
'%<|( <M> )':: make the next placeholder take at least until Mth
161+
display column, padding spaces on the right if necessary
162+
'%>( <N> )', '%>|( <M> )':: similar to '%<( <N> )', '%<|( <M> )' respectively,
163163
but padding spaces on the left
164-
'%>>( <N> )', '%>>|( <N> )':: similar to '%>( <N> )', '%>|( <N> )'
164+
'%>>( <N> )', '%>>|( <M> )':: similar to '%>( <N> )', '%>|( <M> )'
165165
respectively, except that if the next
166166
placeholder takes more spaces than given and
167167
there are spaces on its left, use those
168168
spaces
169-
'%><( <N> )', '%><|( <N> )':: similar to '%<( <N> )', '%<|( <N> )'
169+
'%><( <N> )', '%><|( <M> )':: similar to '%<( <N> )', '%<|( <M> )'
170170
respectively, but padding both sides
171171
(i.e. the text is centered)
172172

0 commit comments

Comments
 (0)