mirror of
https://github.com/git/git.git
synced 2024-11-18 15:04:49 +01:00
cd1957f5fc
When doing a reflog walk, you can get some information about the reflog (such as the subject line), but not the identity information (i.e., name and email). Let's make those available, mimicing the options for author and committer identity. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
199 lines
6.1 KiB
Text
199 lines
6.1 KiB
Text
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.
|
|
|
|
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:
|
|
|
|
* 'oneline'
|
|
|
|
<sha1> <title line>
|
|
+
|
|
This is designed to be as compact as possible.
|
|
|
|
* 'short'
|
|
|
|
commit <sha1>
|
|
Author: <author>
|
|
|
|
<title line>
|
|
|
|
* 'medium'
|
|
|
|
commit <sha1>
|
|
Author: <author>
|
|
Date: <author date>
|
|
|
|
<title line>
|
|
|
|
<full commit message>
|
|
|
|
* 'full'
|
|
|
|
commit <sha1>
|
|
Author: <author>
|
|
Commit: <committer>
|
|
|
|
<title line>
|
|
|
|
<full commit message>
|
|
|
|
* 'fuller'
|
|
|
|
commit <sha1>
|
|
Author: <author>
|
|
AuthorDate: <author date>
|
|
Commit: <committer>
|
|
CommitDate: <committer date>
|
|
|
|
<title line>
|
|
|
|
<full commit message>
|
|
|
|
* 'email'
|
|
|
|
From <sha1> <date>
|
|
From: <author>
|
|
Date: <author date>
|
|
Subject: [PATCH] <title line>
|
|
|
|
<full commit message>
|
|
|
|
* 'raw'
|
|
+
|
|
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.
|
|
|
|
* 'format:<string>'
|
|
+
|
|
The 'format:<string>' format allows you to specify which information
|
|
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'.
|
|
+
|
|
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
|
|
would show something like this:
|
|
+
|
|
-------
|
|
The author of fe6e0ee was Junio C Hamano, 23 hours ago
|
|
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
|
|
|
|
--------
|
|
+
|
|
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
|
|
- '%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 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
|
|
- '%cD': committer date, RFC2822 style
|
|
- '%cr': committer date, relative
|
|
- '%ct': committer date, UNIX timestamp
|
|
- '%ci': committer date, ISO 8601 format
|
|
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
|
|
- '%e': encoding
|
|
- '%s': subject
|
|
- '%f': sanitized subject line, suitable for a filename
|
|
- '%b': body
|
|
- '%B': raw body (unwrapped subject and body)
|
|
- '%N': commit notes
|
|
- '%gD': reflog selector, e.g., `refs/stash@\{1\}`
|
|
- '%gd': shortened reflog selector, e.g., `stash@\{1\}`
|
|
- '%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])
|
|
- '%gs': reflog subject
|
|
- '%Cred': switch color to red
|
|
- '%Cgreen': switch color to green
|
|
- '%Cblue': switch color to blue
|
|
- '%Creset': reset color
|
|
- '%C(...)': color specification, as described in color.branch.* config option
|
|
- '%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].
|
|
|
|
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.
|
|
|
|
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.
|
|
|
|
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.
|
|
|
|
* '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
|
|
---------------------
|
|
+
|
|
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
|
|
---------------------
|