doc: group pretty-format.txt placeholders descriptions
The placeholders can be grouped into three kinds: * literals * affecting formatting of later placeholders * expanding to information in commit Also change the list to a definition list (using '::') Signed-off-by: Anders Waldenborg <anders@0x63.nu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Anders Waldenborg
Junio C Hamano
parent
cd69ec8cde
commit
42617752d4
@ -102,118 +102,133 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
|
|||||||
+
|
+
|
||||||
The placeholders are:
|
The placeholders are:
|
||||||
|
|
||||||
- '%H': commit hash
|
- Placeholders that expand to a single literal character:
|
||||||
- '%h': abbreviated commit hash
|
'%n':: newline
|
||||||
- '%T': tree hash
|
'%%':: a raw '%'
|
||||||
- '%t': abbreviated tree hash
|
'%x00':: print a byte from a hex code
|
||||||
- '%P': parent hashes
|
|
||||||
- '%p': abbreviated parent hashes
|
- Placeholders that affect formatting of later placeholders:
|
||||||
- '%an': author name
|
'%Cred':: switch color to red
|
||||||
- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1]
|
'%Cgreen':: switch color to green
|
||||||
or linkgit:git-blame[1])
|
'%Cblue':: switch color to blue
|
||||||
- '%ae': author email
|
'%Creset':: reset color
|
||||||
- '%aE': author email (respecting .mailmap, see
|
'%C(...)':: color specification, as described under Values in the
|
||||||
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
"CONFIGURATION FILE" section of linkgit:git-config[1]. By
|
||||||
- '%ad': author date (format respects --date= option)
|
default, colors are shown only when enabled for log output
|
||||||
- '%aD': author date, RFC2822 style
|
(by `color.diff`, `color.ui`, or `--color`, and respecting
|
||||||
- '%ar': author date, relative
|
the `auto` settings of the former if we are going to a
|
||||||
- '%at': author date, UNIX timestamp
|
terminal). `%C(auto,...)` is accepted as a historical
|
||||||
- '%ai': author date, ISO 8601-like format
|
synonym for the default (e.g., `%C(auto,red)`). Specifying
|
||||||
- '%aI': author date, strict ISO 8601 format
|
`%C(always,...) will show the colors even when color is
|
||||||
- '%cn': committer name
|
not otherwise enabled (though consider just using
|
||||||
- '%cN': committer name (respecting .mailmap, see
|
`--color=always` to enable color for the whole output,
|
||||||
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
including this format and anything else git might color).
|
||||||
- '%ce': committer email
|
`auto` alone (i.e. `%C(auto)`) will turn on auto coloring
|
||||||
- '%cE': committer email (respecting .mailmap, see
|
on the next placeholders until the color is switched
|
||||||
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
again.
|
||||||
- '%cd': committer date (format respects --date= option)
|
'%m':: left (`<`), right (`>`) or boundary (`-`) mark
|
||||||
- '%cD': committer date, RFC2822 style
|
'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
|
||||||
- '%cr': committer date, relative
|
linkgit:git-shortlog[1].
|
||||||
- '%ct': committer date, UNIX timestamp
|
'%<(<N>[,trunc|ltrunc|mtrunc])':: make the next placeholder take at
|
||||||
- '%ci': committer date, ISO 8601-like format
|
least N columns, padding spaces on
|
||||||
- '%cI': committer date, strict ISO 8601 format
|
the right if necessary. Optionally
|
||||||
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
|
truncate at the beginning (ltrunc),
|
||||||
- '%D': ref names without the " (", ")" wrapping.
|
the middle (mtrunc) or the end
|
||||||
- '%e': encoding
|
(trunc) if the output is longer than
|
||||||
- '%s': subject
|
N columns. Note that truncating
|
||||||
- '%f': sanitized subject line, suitable for a filename
|
only works correctly with N >= 2.
|
||||||
- '%b': body
|
'%<|(<N>)':: make the next placeholder take at least until Nth
|
||||||
- '%B': raw body (unwrapped subject and body)
|
columns, padding spaces on the right if necessary
|
||||||
|
'%>(<N>)', '%>|(<N>)':: similar to '%<(<N>)', '%<|(<N>)' respectively,
|
||||||
|
but padding spaces on the left
|
||||||
|
'%>>(<N>)', '%>>|(<N>)':: similar to '%>(<N>)', '%>|(<N>)'
|
||||||
|
respectively, except that if the next
|
||||||
|
placeholder takes more spaces than given and
|
||||||
|
there are spaces on its left, use those
|
||||||
|
spaces
|
||||||
|
'%><(<N>)', '%><|(<N>)':: similar to '%<(<N>)', '%<|(<N>)'
|
||||||
|
respectively, but padding both sides
|
||||||
|
(i.e. the text is centered)
|
||||||
|
|
||||||
|
- Placeholders that expand to information extracted from the commit:
|
||||||
|
'%H':: commit hash
|
||||||
|
'%h':: abbreviated commit hash
|
||||||
|
'%T':: tree hash
|
||||||
|
'%t':: abbreviated tree hash
|
||||||
|
'%P':: parent hashes
|
||||||
|
'%p':: abbreviated parent hashes
|
||||||
|
'%an':: author name
|
||||||
|
'%aN':: author name (respecting .mailmap, see linkgit:git-shortlog[1]
|
||||||
|
or linkgit:git-blame[1])
|
||||||
|
'%ae':: author email
|
||||||
|
'%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
|
||||||
|
or linkgit:git-blame[1])
|
||||||
|
'%ad':: author date (format respects --date= option)
|
||||||
|
'%aD':: author date, RFC2822 style
|
||||||
|
'%ar':: author date, relative
|
||||||
|
'%at':: author date, UNIX timestamp
|
||||||
|
'%ai':: author date, ISO 8601-like format
|
||||||
|
'%aI':: author date, strict ISO 8601 format
|
||||||
|
'%cn':: committer name
|
||||||
|
'%cN':: committer name (respecting .mailmap, see
|
||||||
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
||||||
|
'%ce':: committer email
|
||||||
|
'%cE':: committer email (respecting .mailmap, see
|
||||||
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
||||||
|
'%cd':: committer date (format respects --date= option)
|
||||||
|
'%cD':: committer date, RFC2822 style
|
||||||
|
'%cr':: committer date, relative
|
||||||
|
'%ct':: committer date, UNIX timestamp
|
||||||
|
'%ci':: committer date, ISO 8601-like format
|
||||||
|
'%cI':: committer date, strict ISO 8601 format
|
||||||
|
'%d':: ref names, like the --decorate option of linkgit:git-log[1]
|
||||||
|
'%D':: ref names without the " (", ")" wrapping.
|
||||||
|
'%e':: encoding
|
||||||
|
'%s':: subject
|
||||||
|
'%f':: sanitized subject line, suitable for a filename
|
||||||
|
'%b':: body
|
||||||
|
'%B':: raw body (unwrapped subject and body)
|
||||||
ifndef::git-rev-list[]
|
ifndef::git-rev-list[]
|
||||||
- '%N': commit notes
|
'%N':: commit notes
|
||||||
endif::git-rev-list[]
|
endif::git-rev-list[]
|
||||||
- '%GG': raw verification message from GPG for a signed commit
|
'%GG':: raw verification message from GPG for a signed commit
|
||||||
- '%G?': show "G" for a good (valid) signature,
|
'%G?':: show "G" for a good (valid) signature,
|
||||||
"B" for a bad signature,
|
"B" for a bad signature,
|
||||||
"U" for a good signature with unknown validity,
|
"U" for a good signature with unknown validity,
|
||||||
"X" for a good signature that has expired,
|
"X" for a good signature that has expired,
|
||||||
"Y" for a good signature made by an expired key,
|
"Y" for a good signature made by an expired key,
|
||||||
"R" for a good signature made by a revoked key,
|
"R" for a good signature made by a revoked key,
|
||||||
"E" if the signature cannot be checked (e.g. missing key)
|
"E" if the signature cannot be checked (e.g. missing key)
|
||||||
and "N" for no signature
|
and "N" for no signature
|
||||||
- '%GS': show the name of the signer for a signed commit
|
'%GS':: show the name of the signer for a signed commit
|
||||||
- '%GK': show the key used to sign a signed commit
|
'%GK':: show the key used to sign a signed commit
|
||||||
- '%GF': show the fingerprint of the key used to sign a signed commit
|
'%GF':: show the fingerprint of the key used to sign a signed commit
|
||||||
- '%GP': show the fingerprint of the primary key whose subkey was used
|
'%GP':: show the fingerprint of the primary key whose subkey was used
|
||||||
to sign a signed commit
|
to sign a signed commit
|
||||||
- '%gD': reflog selector, e.g., `refs/stash@{1}` or
|
'%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
|
||||||
`refs/stash@{2 minutes ago`}; the format follows the rules described
|
minutes ago`}; the format follows the rules described for the
|
||||||
for the `-g` option. The portion before the `@` is the refname as
|
`-g` option. The portion before the `@` is the refname as
|
||||||
given on the command line (so `git log -g refs/heads/master` would
|
given on the command line (so `git log -g refs/heads/master`
|
||||||
yield `refs/heads/master@{0}`).
|
would yield `refs/heads/master@{0}`).
|
||||||
- '%gd': shortened reflog selector; same as `%gD`, but the refname
|
'%gd':: shortened reflog selector; same as `%gD`, but the refname
|
||||||
portion is shortened for human readability (so `refs/heads/master`
|
portion is shortened for human readability (so
|
||||||
becomes just `master`).
|
`refs/heads/master` becomes just `master`).
|
||||||
- '%gn': reflog identity name
|
'%gn':: reflog identity name
|
||||||
- '%gN': reflog identity name (respecting .mailmap, see
|
'%gN':: reflog identity name (respecting .mailmap, see
|
||||||
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
||||||
- '%ge': reflog identity email
|
'%ge':: reflog identity email
|
||||||
- '%gE': reflog identity email (respecting .mailmap, see
|
'%gE':: reflog identity email (respecting .mailmap, see
|
||||||
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
||||||
- '%gs': reflog subject
|
'%gs':: reflog subject
|
||||||
- '%Cred': switch color to red
|
'%(trailers[:options])':: display the trailers of the body as
|
||||||
- '%Cgreen': switch color to green
|
interpreted by
|
||||||
- '%Cblue': switch color to blue
|
linkgit:git-interpret-trailers[1]. The
|
||||||
- '%Creset': reset color
|
`trailers` string may be followed by a colon
|
||||||
- '%C(...)': color specification, as described under Values in the
|
and zero or more comma-separated options:
|
||||||
"CONFIGURATION FILE" section of linkgit:git-config[1].
|
** 'only': omit non-trailer lines from the trailer block.
|
||||||
By default, colors are shown only when enabled for log output (by
|
** 'unfold': make it behave as if interpret-trailer's `--unfold`
|
||||||
`color.diff`, `color.ui`, or `--color`, and respecting the `auto`
|
option was given. E.g., `%(trailers:only,unfold)` unfolds and
|
||||||
settings of the former if we are going to a terminal). `%C(auto,...)`
|
shows all trailer lines.
|
||||||
is accepted as a historical synonym for the default (e.g.,
|
|
||||||
`%C(auto,red)`). Specifying `%C(always,...) will show the colors
|
|
||||||
even when color is not otherwise enabled (though consider
|
|
||||||
just using `--color=always` to enable color for the whole output,
|
|
||||||
including this format and anything else git might color). `auto`
|
|
||||||
alone (i.e. `%C(auto)`) will turn on auto coloring on the next
|
|
||||||
placeholders until the color is switched again.
|
|
||||||
- '%m': left (`<`), right (`>`) or boundary (`-`) mark
|
|
||||||
- '%n': newline
|
|
||||||
- '%%': a raw '%'
|
|
||||||
- '%x00': print a byte from a hex code
|
|
||||||
- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
|
|
||||||
linkgit:git-shortlog[1].
|
|
||||||
- '%<(<N>[,trunc|ltrunc|mtrunc])': make the next placeholder take at
|
|
||||||
least N columns, 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 only works correctly with N >= 2.
|
|
||||||
- '%<|(<N>)': make the next placeholder take at least until Nth
|
|
||||||
columns, padding spaces on the right if necessary
|
|
||||||
- '%>(<N>)', '%>|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
|
|
||||||
respectively, but padding spaces on the left
|
|
||||||
- '%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)'
|
|
||||||
respectively, except that if the next placeholder takes more spaces
|
|
||||||
than given and there are spaces on its left, use those spaces
|
|
||||||
- '%><(<N>)', '%><|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
|
|
||||||
respectively, but padding both sides (i.e. the text is centered)
|
|
||||||
- %(trailers[:options]): display the trailers of the body as interpreted
|
|
||||||
by linkgit:git-interpret-trailers[1]. The `trailers` string may be
|
|
||||||
followed by a colon and zero or more comma-separated options. If the
|
|
||||||
`only` option is given, omit non-trailer lines from the trailer block.
|
|
||||||
If the `unfold` option is given, behave as if interpret-trailer's
|
|
||||||
`--unfold` option was given. E.g., `%(trailers:only,unfold)` to do
|
|
||||||
both.
|
|
||||||
|
|
||||||
NOTE: Some placeholders may depend on other options given to the
|
NOTE: Some placeholders may depend on other options given to the
|
||||||
revision traversal engine. For example, the `%g*` reflog options will
|
revision traversal engine. For example, the `%g*` reflog options will
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user