2007-05-14 03:25:45 +04: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 15:00:44 +04: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 03:25:45 +04:00
|
|
|
|
|
|
|
* 'oneline'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
<sha1> <title line>
|
|
|
|
+
|
|
|
|
This is designed to be as compact as possible.
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'short'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'medium'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
2008-12-19 15:14:52 +03:00
|
|
|
Date: <author date>
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'full'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
Commit: <committer>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'fuller'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
commit <sha1>
|
2008-12-19 15:14:52 +03:00
|
|
|
Author: <author>
|
2008-07-05 04:00:13 +04:00
|
|
|
AuthorDate: <author date>
|
2008-12-19 15:14:52 +03:00
|
|
|
Commit: <committer>
|
2008-07-05 04:00:13 +04:00
|
|
|
CommitDate: <committer date>
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'email'
|
2006-11-22 02:49:15 +03:00
|
|
|
|
|
|
|
From <sha1> <date>
|
|
|
|
From: <author>
|
2008-07-05 04:00:13 +04:00
|
|
|
Date: <author date>
|
2006-11-22 02:49:15 +03:00
|
|
|
Subject: [PATCH] <title line>
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
<full commit message>
|
2006-11-22 02:49:15 +03:00
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
* 'raw'
|
2006-11-22 02:49:15 +03:00
|
|
|
+
|
|
|
|
The 'raw' format shows the entire commit exactly as
|
|
|
|
stored in the commit object. Notably, the SHA1s are
|
|
|
|
displayed in full, regardless of whether --abbrev or
|
|
|
|
--no-abbrev are used, and 'parents' information show the
|
|
|
|
true parent commits, without taking grafts nor history
|
|
|
|
simplification into account.
|
2006-12-30 22:59:08 +03:00
|
|
|
|
2010-06-01 21:54:46 +04:00
|
|
|
* 'format:<string>'
|
2007-02-23 03:35:03 +03:00
|
|
|
+
|
2010-06-01 21:54:46 +04:00
|
|
|
The 'format:<string>' format allows you to specify which information
|
2007-02-23 03:35:03 +03: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 03:25:45 +04:00
|
|
|
+
|
|
|
|
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
|
2007-02-23 03:35:03 +03:00
|
|
|
would show something like this:
|
2007-05-14 03:25:45 +04:00
|
|
|
+
|
|
|
|
-------
|
2007-02-23 03:35:03 +03:00
|
|
|
The author of fe6e0ee was Junio C Hamano, 23 hours ago
|
|
|
|
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
|
|
|
|
|
2007-05-14 03:25:45 +04:00
|
|
|
--------
|
|
|
|
+
|
2007-02-23 03:35:03 +03: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
|
2009-02-08 17:34:31 +03:00
|
|
|
- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%ae': author email
|
2009-02-08 17:34:31 +03:00
|
|
|
- '%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2008-08-29 04:54:59 +04:00
|
|
|
- '%ad': author date (format respects --date= option)
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%aD': author date, RFC2822 style
|
|
|
|
- '%ar': author date, relative
|
|
|
|
- '%at': author date, UNIX timestamp
|
2007-07-14 03:00:42 +04:00
|
|
|
- '%ai': author date, ISO 8601 format
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%cn': committer name
|
2009-02-08 17:34:31 +03:00
|
|
|
- '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%ce': committer email
|
2009-02-08 17:34:31 +03:00
|
|
|
- '%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%cd': committer date
|
|
|
|
- '%cD': committer date, RFC2822 style
|
|
|
|
- '%cr': committer date, relative
|
|
|
|
- '%ct': committer date, UNIX timestamp
|
2007-07-14 03:00:42 +04:00
|
|
|
- '%ci': committer date, ISO 8601 format
|
2008-09-05 01:40:03 +04:00
|
|
|
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%e': encoding
|
|
|
|
- '%s': subject
|
2009-03-23 05:14:01 +03:00
|
|
|
- '%f': sanitized subject line, suitable for a filename
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%b': body
|
2010-03-25 05:51:52 +03:00
|
|
|
- '%B': raw body (unwrapped subject and body)
|
2009-10-09 14:22:05 +04:00
|
|
|
- '%N': commit notes
|
2012-09-20 12:10:38 +04:00
|
|
|
- '%GG': raw verification message from GPG for a signed commit
|
|
|
|
- '%G?': show either "G" for Good or "B" for Bad for a signed commit
|
|
|
|
- '%GS': show the name of the signer for a signed commit
|
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 12:51:57 +04:00
|
|
|
- '%gD': reflog selector, e.g., `refs/stash@{1}`
|
|
|
|
- '%gd': shortened reflog selector, e.g., `stash@{1}`
|
2011-12-16 15:40:24 +04:00
|
|
|
- '%gn': reflog identity name
|
|
|
|
- '%gN': reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
|
|
|
- '%ge': reflog identity email
|
|
|
|
- '%gE': reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2009-10-19 19:48:10 +04:00
|
|
|
- '%gs': reflog subject
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%Cred': switch color to red
|
|
|
|
- '%Cgreen': switch color to green
|
|
|
|
- '%Cblue': switch color to blue
|
|
|
|
- '%Creset': reset color
|
2012-12-18 02:56:49 +04:00
|
|
|
- '%C(...)': color specification, as described in color.branch.* config option;
|
|
|
|
adding `auto,` at the beginning will emit color only when colors are
|
|
|
|
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)
|
2007-04-09 13:34:05 +04:00
|
|
|
- '%m': left, right or boundary mark
|
2007-02-23 03:35:03 +03:00
|
|
|
- '%n': newline
|
2010-01-13 20:35:31 +03:00
|
|
|
- '%%': a raw '%'
|
2008-03-21 18:05:06 +03:00
|
|
|
- '%x00': print a byte from a hex code
|
2009-11-22 19:15:31 +03:00
|
|
|
- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
|
2009-11-24 01:40:03 +03:00
|
|
|
linkgit:git-shortlog[1].
|
2008-06-12 10:14:28 +04:00
|
|
|
|
2009-10-19 19:48:10 +04: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
|
|
|
|
`git log -g`). The `%d` placeholder will use the "short" decoration
|
|
|
|
format if `--decorate` was not already provided on the command line.
|
|
|
|
|
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 12:51:57 +04:00
|
|
|
If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
|
2009-10-05 10:43:32 +04:00
|
|
|
is inserted immediately before the expansion if and only if the
|
|
|
|
placeholder expands to a non-empty string.
|
|
|
|
|
|
|
|
If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
|
|
|
|
immediately precede the expansion are deleted if and only if the
|
|
|
|
placeholder expands to an empty string.
|
|
|
|
|
2010-06-14 20:12:29 +04: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 10:14:28 +04: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 12:59:15 +03: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
|
|
|
|
---------------------
|