2007-05-14 01:25:45 +02: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 13:00:44 +02: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 01:25:45 +02:00
|
|
|
|
|
|
|
* 'oneline'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
<sha1> <title line>
|
|
|
|
+
|
|
|
|
This is designed to be as compact as possible.
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'short'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'medium'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
2008-12-19 13:14:52 +01:00
|
|
|
Date: <author date>
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'full'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
commit <sha1>
|
|
|
|
Author: <author>
|
|
|
|
Commit: <committer>
|
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'fuller'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
commit <sha1>
|
2008-12-19 13:14:52 +01:00
|
|
|
Author: <author>
|
2008-07-05 02:00:13 +02:00
|
|
|
AuthorDate: <author date>
|
2008-12-19 13:14:52 +01:00
|
|
|
Commit: <committer>
|
2008-07-05 02:00:13 +02:00
|
|
|
CommitDate: <committer date>
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
<title line>
|
|
|
|
|
|
|
|
<full commit message>
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'email'
|
2006-11-22 00:49:15 +01:00
|
|
|
|
|
|
|
From <sha1> <date>
|
|
|
|
From: <author>
|
2008-07-05 02:00:13 +02:00
|
|
|
Date: <author date>
|
2006-11-22 00:49:15 +01:00
|
|
|
Subject: [PATCH] <title line>
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
<full commit message>
|
2006-11-22 00:49:15 +01:00
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
* 'raw'
|
2006-11-22 00:49:15 +01: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 20:59:08 +01:00
|
|
|
|
2010-06-01 19:54:46 +02:00
|
|
|
* 'format:<string>'
|
2007-02-23 01:35:03 +01:00
|
|
|
+
|
2010-06-01 19:54:46 +02:00
|
|
|
The 'format:<string>' format allows you to specify which information
|
2007-02-23 01:35:03 +01: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 01:25:45 +02:00
|
|
|
+
|
|
|
|
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
|
2007-02-23 01:35:03 +01:00
|
|
|
would show something like this:
|
2007-05-14 01:25:45 +02:00
|
|
|
+
|
|
|
|
-------
|
2007-02-23 01:35:03 +01: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 01:25:45 +02:00
|
|
|
--------
|
|
|
|
+
|
2007-02-23 01:35:03 +01: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 15:34:31 +01:00
|
|
|
- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%ae': author email
|
2009-02-08 15:34:31 +01:00
|
|
|
- '%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2008-08-29 02:54:59 +02:00
|
|
|
- '%ad': author date (format respects --date= option)
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%aD': author date, RFC2822 style
|
|
|
|
- '%ar': author date, relative
|
|
|
|
- '%at': author date, UNIX timestamp
|
2007-07-14 01:00:42 +02:00
|
|
|
- '%ai': author date, ISO 8601 format
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%cn': committer name
|
2009-02-08 15:34:31 +01:00
|
|
|
- '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%ce': committer email
|
2009-02-08 15:34:31 +01:00
|
|
|
- '%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%cd': committer date
|
|
|
|
- '%cD': committer date, RFC2822 style
|
|
|
|
- '%cr': committer date, relative
|
|
|
|
- '%ct': committer date, UNIX timestamp
|
2007-07-14 01:00:42 +02:00
|
|
|
- '%ci': committer date, ISO 8601 format
|
2008-09-04 23:40:03 +02:00
|
|
|
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%e': encoding
|
|
|
|
- '%s': subject
|
2009-03-23 03:14:01 +01:00
|
|
|
- '%f': sanitized subject line, suitable for a filename
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%b': body
|
2010-03-25 03:51:52 +01:00
|
|
|
- '%B': raw body (unwrapped subject and body)
|
2009-10-09 12:22:05 +02:00
|
|
|
- '%N': commit notes
|
2009-10-19 17:48:10 +02:00
|
|
|
- '%gD': reflog selector, e.g., `refs/stash@\{1\}`
|
|
|
|
- '%gd': shortened reflog selector, e.g., `stash@\{1\}`
|
|
|
|
- '%gs': reflog subject
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%Cred': switch color to red
|
|
|
|
- '%Cgreen': switch color to green
|
|
|
|
- '%Cblue': switch color to blue
|
|
|
|
- '%Creset': reset color
|
expand --pretty=format color options
Currently, the only colors available to --pretty=format
users are red, green, and blue. Rather than expand it with a
few new colors, this patch makes the usual config color
syntax available, including more colors, backgrounds, and
attributes.
Because colors are no longer bounded to a single word (e.g.,
%Cred), this uses a more advanced syntax that features a
beginning and end delimiter (but the old syntax still
works). So you can now do:
git log --pretty=tformat:'%C(yellow)%h%C(reset) %s'
to emulate --pretty=oneline, or even
git log --pretty=tformat:'%C(cyan magenta bold)%s%C(reset)'
if you want to relive the awesomeness of 4-color CGA.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-17 16:38:46 +01:00
|
|
|
- '%C(...)': color specification, as described in color.branch.* config option
|
2007-04-09 11:34:05 +02:00
|
|
|
- '%m': left, right or boundary mark
|
2007-02-23 01:35:03 +01:00
|
|
|
- '%n': newline
|
2010-01-13 18:35:31 +01:00
|
|
|
- '%%': a raw '%'
|
2008-03-21 16:05:06 +01:00
|
|
|
- '%x00': print a byte from a hex code
|
2009-11-22 17:15:31 +01:00
|
|
|
- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
|
2009-11-23 23:40:03 +01:00
|
|
|
linkgit:git-shortlog[1].
|
2008-06-12 08:14:28 +02:00
|
|
|
|
2009-10-19 17:48:10 +02: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.
|
|
|
|
|
2009-10-05 08:43:32 +02:00
|
|
|
If you add a `{plus}` (plus sign) after '%' of a placeholder, a line-feed
|
|
|
|
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.
|
|
|
|
|
2008-06-12 08:14:28 +02: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 10:59:15 +01: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
|
|
|
|
---------------------
|