2007-05-14 07:25:45 +08:00
|
|
|
PRETTY FORMATS
|
|
|
|
--------------
|
|
|
|
|
|
|
|
If the commit is a merge, and if the pretty-format
|
|
|
|
is not 'oneline', 'email' or 'raw', an additional line is
|
|
|
|
inserted before the 'Author:' line. This line begins with
|
|
|
|
"Merge: " and the sha1s of ancestral commits are printed,
|
|
|
|
separated by spaces. Note that the listed commits may not
|
|
|
|
necessarily be the list of the *direct* parent commits if you
|
|
|
|
have limited your view of history: for example, if you are
|
|
|
|
only interested in changes related to a certain directory or
|
|
|
|
file.
|
|
|
|
|
2010-05-02 19:00:44 +08:00
|
|
|
There are several built-in formats, and you can define
|
|
|
|
additional formats by setting a pretty.<name>
|
|
|
|
config option to either another format name, or a
|
|
|
|
'format:' string, as described below (see
|
|
|
|
linkgit:git-config[1]). Here are the details of the
|
|
|
|
built-in formats:
|
2007-05-14 07:25:45 +08:00
|
|
|
|
|
|
|
* 'oneline'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
<sha1> <title line>
|
|
|
|
+
|
|
|
|
This is designed to be as compact as possible.
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'short'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'medium'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
2008-12-19 20:14:52 +08:00
|
|
|
Date: <author date>
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'full'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
Commit: <committer>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'fuller'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
commit <sha1>
|
2008-12-19 20:14:52 +08:00
|
|
|
Author: <author>
|
2008-07-05 08:00:13 +08:00
|
|
|
AuthorDate: <author date>
|
2008-12-19 20:14:52 +08:00
|
|
|
Commit: <committer>
|
2008-07-05 08:00:13 +08:00
|
|
|
CommitDate: <committer date>
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'email'
|
2006-11-22 07:49:15 +08:00
|
|
|
|
|
|
|
From <sha1> <date>
|
|
|
|
From: <author>
|
2008-07-05 08:00:13 +08:00
|
|
|
Date: <author date>
|
2006-11-22 07:49:15 +08:00
|
|
|
Subject: [PATCH] <title line>
|
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
<full commit message>
|
2006-11-22 07:49:15 +08:00
|
|
|
|
2007-05-14 07:25:45 +08:00
|
|
|
* 'raw'
|
2006-11-22 07:49:15 +08:00
|
|
|
+
|
|
|
|
The 'raw' format shows the entire commit exactly as
|
2013-04-16 01:49:04 +08:00
|
|
|
stored in the commit object. Notably, the SHA-1s are
|
2006-11-22 07:49:15 +08:00
|
|
|
displayed in full, regardless of whether --abbrev or
|
|
|
|
--no-abbrev are used, and 'parents' information show the
|
2014-04-01 06:11:44 +08:00
|
|
|
true parent commits, without taking grafts or history
|
2015-05-19 01:55:58 +08:00
|
|
|
simplification into account. Note that this format affects the way
|
|
|
|
commits are displayed, but not the way the diff is shown e.g. with
|
|
|
|
`git log --raw`. To get full object names in a raw diff format,
|
|
|
|
use `--no-abbrev`.
|
2006-12-31 03:59:08 +08:00
|
|
|
|
2010-06-02 01:54:46 +08:00
|
|
|
* 'format:<string>'
|
2007-02-23 08:35:03 +08:00
|
|
|
+
|
2010-06-02 01:54:46 +08:00
|
|
|
The 'format:<string>' format allows you to specify which information
|
2007-02-23 08:35:03 +08:00
|
|
|
you want to show. It works a little bit like printf format,
|
|
|
|
with the notable exception that you get a newline with '%n'
|
|
|
|
instead of '\n'.
|
2007-05-14 07:25:45 +08:00
|
|
|
+
|
|
|
|
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
|
2007-02-23 08:35:03 +08:00
|
|
|
would show something like this:
|
2007-05-14 07:25:45 +08:00
|
|
|
+
|
|
|
|
-------
|
2007-02-23 08:35:03 +08:00
|
|
|
The author of fe6e0ee was Junio C Hamano, 23 hours ago
|
|
|
|
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
|
|
|
|
|
2014-10-09 04:46:10 +08:00
|
|
|
-------
|
2007-05-14 07:25:45 +08:00
|
|
|
+
|
2007-02-23 08:35:03 +08:00
|
|
|
The placeholders are:
|
|
|
|
|
|
|
|
- '%H': commit hash
|
|
|
|
- '%h': abbreviated commit hash
|
|
|
|
- '%T': tree hash
|
|
|
|
- '%t': abbreviated tree hash
|
|
|
|
- '%P': parent hashes
|
|
|
|
- '%p': abbreviated parent hashes
|
|
|
|
- '%an': author name
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1]
|
|
|
|
or linkgit:git-blame[1])
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%ae': author email
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%aE': author email (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2008-08-29 08:54:59 +08:00
|
|
|
- '%ad': author date (format respects --date= option)
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%aD': author date, RFC2822 style
|
|
|
|
- '%ar': author date, relative
|
|
|
|
- '%at': author date, UNIX timestamp
|
2014-08-30 00:58:42 +08:00
|
|
|
- '%ai': author date, ISO 8601-like format
|
|
|
|
- '%aI': author date, strict ISO 8601 format
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%cn': committer name
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%cN': committer name (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%ce': committer email
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%cE': committer email (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2014-08-20 20:27:10 +08:00
|
|
|
- '%cd': committer date (format respects --date= option)
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%cD': committer date, RFC2822 style
|
|
|
|
- '%cr': committer date, relative
|
|
|
|
- '%ct': committer date, UNIX timestamp
|
2014-08-30 00:58:42 +08:00
|
|
|
- '%ci': committer date, ISO 8601-like format
|
|
|
|
- '%cI': committer date, strict ISO 8601 format
|
2008-09-05 05:40:03 +08:00
|
|
|
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
|
2014-09-19 04:53:53 +08:00
|
|
|
- '%D': ref names without the " (", ")" wrapping.
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%e': encoding
|
|
|
|
- '%s': subject
|
2009-03-23 10:14:01 +08:00
|
|
|
- '%f': sanitized subject line, suitable for a filename
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%b': body
|
2010-03-25 10:51:52 +08:00
|
|
|
- '%B': raw body (unwrapped subject and body)
|
2015-08-24 01:56:40 +08:00
|
|
|
ifndef::git-rev-list[]
|
2009-10-09 18:22:05 +08:00
|
|
|
- '%N': commit notes
|
2015-08-24 01:56:40 +08:00
|
|
|
endif::git-rev-list[]
|
2012-09-20 16:10:38 +08:00
|
|
|
- '%GG': raw verification message from GPG for a signed commit
|
gpg-interface: use more status letters
According to gpg2's doc/DETAILS:
For each signature only one of the codes GOODSIG, BADSIG,
EXPSIG, EXPKEYSIG, REVKEYSIG or ERRSIG will be emitted.
gpg1 ("classic") behaves the same (although doc/DETAILS differs).
Currently, we parse gpg's status output for GOODSIG, BADSIG and
trust information and translate that into status codes G, B, U, N
for the %G? format specifier.
git-verify-* returns success in the GOODSIG case only. This is
somewhat in disagreement with gpg, which considers the first 5 of
the 6 above as VALIDSIG, but we err on the very safe side.
Introduce additional status codes E, X, Y, R for ERRSIG, EXPSIG,
EXPKEYSIG, and REVKEYSIG so that a user of %G? gets more information
about the absence of a 'G' on first glance.
Requested-by: Alex <agrambot@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-12 21:04:15 +08:00
|
|
|
- '%G?': show "G" for a good (valid) signature,
|
|
|
|
"B" for a bad signature,
|
|
|
|
"U" for a good signature with unknown validity,
|
|
|
|
"X" for a good signature that has expired,
|
|
|
|
"Y" for a good signature made by an expired key,
|
|
|
|
"R" for a good signature made by a revoked key,
|
|
|
|
"E" if the signature cannot be checked (e.g. missing key)
|
|
|
|
and "N" for no signature
|
2012-09-20 16:10:38 +08:00
|
|
|
- '%GS': show the name of the signer for a signed commit
|
2013-02-15 00:04:46 +08:00
|
|
|
- '%GK': show the key used to sign a signed commit
|
2016-07-23 03:51:37 +08:00
|
|
|
- '%gD': reflog selector, e.g., `refs/stash@{1}` or
|
|
|
|
`refs/stash@{2 minutes ago`}; the format follows the rules described
|
2016-07-23 03:51:41 +08:00
|
|
|
for the `-g` option. The portion before the `@` is the refname as
|
|
|
|
given on the command line (so `git log -g refs/heads/master` would
|
|
|
|
yield `refs/heads/master@{0}`).
|
|
|
|
- '%gd': shortened reflog selector; same as `%gD`, but the refname
|
|
|
|
portion is shortened for human readability (so `refs/heads/master`
|
|
|
|
becomes just `master`).
|
2011-12-16 19:40:24 +08:00
|
|
|
- '%gn': reflog identity name
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%gN': reflog identity name (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2011-12-16 19:40:24 +08:00
|
|
|
- '%ge': reflog identity email
|
2013-04-19 07:08:42 +08:00
|
|
|
- '%gE': reflog identity email (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2009-10-19 23:48:10 +08:00
|
|
|
- '%gs': reflog subject
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%Cred': switch color to red
|
|
|
|
- '%Cgreen': switch color to green
|
|
|
|
- '%Cblue': switch color to blue
|
|
|
|
- '%Creset': reset color
|
2016-10-11 11:41:14 +08:00
|
|
|
- '%C(...)': color specification, as described under Values in the
|
pretty: respect color settings for %C placeholders
The color placeholders have traditionally been
unconditional, showing colors even when git is not otherwise
configured to do so. This was not so bad for their original
use, which was on the command-line (and the user could
decide at that moment whether to add colors or not). But
these days we have configured formats via pretty.*, and
those should operate correctly in multiple contexts.
In 3082517 (log --format: teach %C(auto,black) to respect
color config, 2012-12-17), we gave an extended placeholder
that could be used to accomplish this. But it's rather
clunky to use, because you have to specify it individually
for each color (and their matching resets) in the format.
We shied away from just switching the default to auto,
because it is technically breaking backwards compatibility.
However, there's not really a use case for unconditional
colors. The most plausible reason you would want them is to
redirect "git log" output to a file. But there, the right
answer is --color=always, as it does the right thing both
with custom user-format colors and git-generated colors.
So let's switch to the more useful default. In the
off-chance that somebody really does find a use for
unconditional colors without wanting to enable the rest of
git's colors, we provide a new %C(always,...) to enable the
old behavior. And we can remind them of --color=always in
the documentation.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-13 23:08:46 +08:00
|
|
|
"CONFIGURATION FILE" section of linkgit:git-config[1].
|
|
|
|
By default, colors are shown only when enabled for log output (by
|
|
|
|
`color.diff`, `color.ui`, or `--color`, and respecting the `auto`
|
|
|
|
settings of the former if we are going to a terminal). `%C(auto,...)`
|
|
|
|
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.
|
2016-07-21 05:10:02 +08:00
|
|
|
- '%m': left (`<`), right (`>`) or boundary (`-`) mark
|
2007-02-23 08:35:03 +08:00
|
|
|
- '%n': newline
|
2010-01-14 01:35:31 +08:00
|
|
|
- '%%': a raw '%'
|
2008-03-21 23:05:06 +08:00
|
|
|
- '%x00': print a byte from a hex code
|
2009-11-23 00:15:31 +08:00
|
|
|
- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
|
2009-11-24 06:40:03 +08:00
|
|
|
linkgit:git-shortlog[1].
|
2013-04-19 07:08:51 +08:00
|
|
|
- '%<(<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.
|
2013-04-19 07:08:50 +08:00
|
|
|
- '%<|(<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
|
2013-04-19 07:08:52 +08:00
|
|
|
- '%>>(<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
|
2018-02-28 04:17:44 +08:00
|
|
|
- '%><(<N>)', '%><|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
|
2013-04-19 07:08:50 +08:00
|
|
|
respectively, but padding both sides (i.e. the text is centered)
|
2017-12-08 13:16:36 +08:00
|
|
|
- %(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.
|
2008-06-12 14:14:28 +08:00
|
|
|
|
2009-10-19 23:48:10 +08:00
|
|
|
NOTE: Some placeholders may depend on other options given to the
|
|
|
|
revision traversal engine. For example, the `%g*` reflog options will
|
|
|
|
insert an empty string unless we are traversing reflog entries (e.g., by
|
2014-09-19 04:53:53 +08:00
|
|
|
`git log -g`). The `%d` and `%D` placeholders will use the "short"
|
|
|
|
decoration format if `--decorate` was not already provided on the command
|
|
|
|
line.
|
2009-10-19 23:48:10 +08:00
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 16:51:57 +08:00
|
|
|
If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
|
2009-10-05 14:43:32 +08:00
|
|
|
is inserted immediately before the expansion if and only if the
|
|
|
|
placeholder expands to a non-empty string.
|
|
|
|
|
2017-06-15 18:36:07 +08:00
|
|
|
If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
|
|
|
|
line-feeds immediately preceding the expansion are deleted if and only if the
|
2009-10-05 14:43:32 +08:00
|
|
|
placeholder expands to an empty string.
|
|
|
|
|
2010-06-15 00:12:29 +08:00
|
|
|
If you add a ` ` (space) after '%' of a placeholder, a space
|
|
|
|
is inserted immediately before the expansion if and only if the
|
|
|
|
placeholder expands to a non-empty string.
|
|
|
|
|
2008-06-12 14:14:28 +08:00
|
|
|
* 'tformat:'
|
|
|
|
+
|
|
|
|
The 'tformat:' format works exactly like 'format:', except that it
|
|
|
|
provides "terminator" semantics instead of "separator" semantics. In
|
|
|
|
other words, each commit has the message terminator character (usually a
|
|
|
|
newline) appended, rather than a separator placed between entries.
|
|
|
|
This means that the final entry of a single-line format will be properly
|
|
|
|
terminated with a new line, just as the "oneline" format does.
|
|
|
|
For example:
|
|
|
|
+
|
|
|
|
---------------------
|
|
|
|
$ git log -2 --pretty=format:%h 4da45bef \
|
|
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
|
|
4da45be
|
|
|
|
7134973 -- NO NEWLINE
|
|
|
|
|
|
|
|
$ git log -2 --pretty=tformat:%h 4da45bef \
|
|
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
|
|
4da45be
|
|
|
|
7134973
|
|
|
|
---------------------
|
2009-02-24 17:59:15 +08:00
|
|
|
+
|
|
|
|
In addition, any unrecognized string that has a `%` in it is interpreted
|
|
|
|
as if it has `tformat:` in front of it. For example, these two are
|
|
|
|
equivalent:
|
|
|
|
+
|
|
|
|
---------------------
|
|
|
|
$ git log -2 --pretty=tformat:%h 4da45bef
|
|
|
|
$ git log -2 --pretty=%h 4da45bef
|
|
|
|
---------------------
|