blob: b055a673d83bcf4c106f3f703ca7f4db4ca1d60f [file] [log] [blame]
Junio C Hamano0430e3a2007-05-15 03:13:171PRETTY FORMATS
2--------------
Junio C Hamanoa340aaa2006-11-23 02:47:333
Junio C Hamano0430e3a2007-05-15 03:13:174If the commit is a merge, and if the pretty-format
5is not 'oneline', 'email' or 'raw', an additional line is
6inserted before the 'Author:' line. This line begins with
7"Merge: " and the sha1s of ancestral commits are printed,
8separated by spaces. Note that the listed commits may not
9necessarily be the list of the *direct* parent commits if you
10have limited your view of history: for example, if you are
11only interested in changes related to a certain directory or
12file.
Junio C Hamanoa340aaa2006-11-23 02:47:3313
Junio C Hamano0430e3a2007-05-15 03:13:1714Here are some additional details for each format:
15
16* 'oneline'
Junio C Hamanoa340aaa2006-11-23 02:47:3317
18 <sha1> <title line>
19+
20This is designed to be as compact as possible.
21
Junio C Hamano0430e3a2007-05-15 03:13:1722* 'short'
Junio C Hamanoa340aaa2006-11-23 02:47:3323
24 commit <sha1>
25 Author: <author>
26
27 <title line>
28
Junio C Hamano0430e3a2007-05-15 03:13:1729* 'medium'
Junio C Hamanoa340aaa2006-11-23 02:47:3330
31 commit <sha1>
32 Author: <author>
Junio C Hamano6a3c8272008-12-19 21:38:1833 Date: <author date>
Junio C Hamanoa340aaa2006-11-23 02:47:3334
35 <title line>
36
37 <full commit message>
38
Junio C Hamano0430e3a2007-05-15 03:13:1739* 'full'
Junio C Hamanoa340aaa2006-11-23 02:47:3340
41 commit <sha1>
42 Author: <author>
43 Commit: <committer>
44
45 <title line>
46
47 <full commit message>
48
Junio C Hamano0430e3a2007-05-15 03:13:1749* 'fuller'
Junio C Hamanoa340aaa2006-11-23 02:47:3350
51 commit <sha1>
Junio C Hamano6a3c8272008-12-19 21:38:1852 Author: <author>
Junio C Hamanoba4b9282008-07-06 05:20:3153 AuthorDate: <author date>
Junio C Hamano6a3c8272008-12-19 21:38:1854 Commit: <committer>
Junio C Hamanoba4b9282008-07-06 05:20:3155 CommitDate: <committer date>
Junio C Hamanoa340aaa2006-11-23 02:47:3356
57 <title line>
58
59 <full commit message>
60
Junio C Hamano0430e3a2007-05-15 03:13:1761* 'email'
Junio C Hamanoa340aaa2006-11-23 02:47:3362
63 From <sha1> <date>
64 From: <author>
Junio C Hamanoba4b9282008-07-06 05:20:3165 Date: <author date>
Junio C Hamanoa340aaa2006-11-23 02:47:3366 Subject: [PATCH] <title line>
67
Junio C Hamano0430e3a2007-05-15 03:13:1768 <full commit message>
Junio C Hamanoa340aaa2006-11-23 02:47:3369
Junio C Hamano0430e3a2007-05-15 03:13:1770* 'raw'
Junio C Hamanoa340aaa2006-11-23 02:47:3371+
72The 'raw' format shows the entire commit exactly as
73stored in the commit object. Notably, the SHA1s are
74displayed in full, regardless of whether --abbrev or
75--no-abbrev are used, and 'parents' information show the
76true parent commits, without taking grafts nor history
77simplification into account.
Junio C Hamano775a0f42006-12-31 01:19:1478
Junio C Hamanoe32ec8b2010-06-02 23:32:3179* 'format:<string>'
Junio C Hamanoa3fd83c2007-03-02 10:34:3680+
Junio C Hamanoe32ec8b2010-06-02 23:32:3181The 'format:<string>' format allows you to specify which information
Junio C Hamanoa3fd83c2007-03-02 10:34:3682you want to show. It works a little bit like printf format,
83with the notable exception that you get a newline with '%n'
84instead of '\n'.
Junio C Hamano0430e3a2007-05-15 03:13:1785+
86E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
Junio C Hamanoa3fd83c2007-03-02 10:34:3687would show something like this:
Junio C Hamano0430e3a2007-05-15 03:13:1788+
89-------
Junio C Hamanoa3fd83c2007-03-02 10:34:3690The author of fe6e0ee was Junio C Hamano, 23 hours ago
91The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
92
Junio C Hamano0430e3a2007-05-15 03:13:1793--------
94+
Junio C Hamanoa3fd83c2007-03-02 10:34:3695The placeholders are:
96
97- '%H': commit hash
98- '%h': abbreviated commit hash
99- '%T': tree hash
100- '%t': abbreviated tree hash
101- '%P': parent hashes
102- '%p': abbreviated parent hashes
103- '%an': author name
Junio C Hamano8bc410e2009-02-15 10:38:19104- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36105- '%ae': author email
Junio C Hamano8bc410e2009-02-15 10:38:19106- '%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa387df32008-08-29 08:56:58107- '%ad': author date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36108- '%aD': author date, RFC2822 style
109- '%ar': author date, relative
110- '%at': author date, UNIX timestamp
Junio C Hamano02f130b2007-07-14 08:26:56111- '%ai': author date, ISO 8601 format
Junio C Hamanoa3fd83c2007-03-02 10:34:36112- '%cn': committer name
Junio C Hamano8bc410e2009-02-15 10:38:19113- '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36114- '%ce': committer email
Junio C Hamano8bc410e2009-02-15 10:38:19115- '%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36116- '%cd': committer date
117- '%cD': committer date, RFC2822 style
118- '%cr': committer date, relative
119- '%ct': committer date, UNIX timestamp
Junio C Hamano02f130b2007-07-14 08:26:56120- '%ci': committer date, ISO 8601 format
Junio C Hamano5e4d8de2008-09-19 06:27:02121- '%d': ref names, like the --decorate option of linkgit:git-log[1]
Junio C Hamanoa3fd83c2007-03-02 10:34:36122- '%e': encoding
123- '%s': subject
Junio C Hamano5f9a6f02009-04-06 08:26:56124- '%f': sanitized subject line, suitable for a filename
Junio C Hamanoa3fd83c2007-03-02 10:34:36125- '%b': body
Junio C Hamanocb39aea2010-05-09 07:24:48126- '%B': raw body (unwrapped subject and body)
Junio C Hamano3b70d3c2009-11-21 17:37:37127- '%N': commit notes
Junio C Hamanoc21ab052009-10-31 04:03:55128- '%gD': reflog selector, e.g., `refs/stash@\{1\}`
129- '%gd': shortened reflog selector, e.g., `stash@\{1\}`
130- '%gs': reflog subject
Junio C Hamanoa3fd83c2007-03-02 10:34:36131- '%Cred': switch color to red
132- '%Cgreen': switch color to green
133- '%Cblue': switch color to blue
134- '%Creset': reset color
Junio C Hamanocc0cb312009-01-22 03:38:50135- '%C(...)': color specification, as described in color.branch.* config option
Junio C Hamanod9e0e5d2007-04-14 16:22:04136- '%m': left, right or boundary mark
Junio C Hamanoa3fd83c2007-03-02 10:34:36137- '%n': newline
Junio C Hamanoa9701f02010-01-21 00:42:16138- '%%': a raw '%'
Junio C Hamanob78d2592008-04-09 09:39:08139- '%x00': print a byte from a hex code
Junio C Hamanobf984de2009-11-23 06:11:19140- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
Junio C Hamano5706e0b2009-11-24 10:54:16141 linkgit:git-shortlog[1].
Junio C Hamano6fb124c2008-06-13 10:04:01142
Junio C Hamanoc21ab052009-10-31 04:03:55143NOTE: Some placeholders may depend on other options given to the
144revision traversal engine. For example, the `%g*` reflog options will
145insert an empty string unless we are traversing reflog entries (e.g., by
146`git log -g`). The `%d` placeholder will use the "short" decoration
147format if `--decorate` was not already provided on the command line.
148
Junio C Hamano2bd8a742009-12-01 21:16:59149If you add a `{plus}` (plus sign) after '%' of a placeholder, a line-feed
150is inserted immediately before the expansion if and only if the
151placeholder expands to a non-empty string.
152
153If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
154immediately precede the expansion are deleted if and only if the
155placeholder expands to an empty string.
156
Junio C Hamano6fb124c2008-06-13 10:04:01157* 'tformat:'
158+
159The 'tformat:' format works exactly like 'format:', except that it
160provides "terminator" semantics instead of "separator" semantics. In
161other words, each commit has the message terminator character (usually a
162newline) appended, rather than a separator placed between entries.
163This means that the final entry of a single-line format will be properly
164terminated with a new line, just as the "oneline" format does.
165For example:
166+
167---------------------
168$ git log -2 --pretty=format:%h 4da45bef \
169 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1704da45be
1717134973 -- NO NEWLINE
172
173$ git log -2 --pretty=tformat:%h 4da45bef \
174 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1754da45be
1767134973
177---------------------
Junio C Hamano0a235222009-03-06 08:21:09178+
179In addition, any unrecognized string that has a `%` in it is interpreted
180as if it has `tformat:` in front of it. For example, these two are
181equivalent:
182+
183---------------------
184$ git log -2 --pretty=tformat:%h 4da45bef
185$ git log -2 --pretty=%h 4da45bef
186---------------------