blob: 561cc9f7d7ef1a2502d608e59e2eae345bffd685 [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 Hamanoa574a092010-06-13 19:57:1014There are several built-in formats, and you can define
15additional formats by setting a pretty.<name>
16config option to either another format name, or a
17'format:' string, as described below (see
18linkgit:git-config[1]). Here are the details of the
19built-in formats:
Junio C Hamano0430e3a2007-05-15 03:13:1720
21* 'oneline'
Junio C Hamanoa340aaa2006-11-23 02:47:3322
23 <sha1> <title line>
24+
25This is designed to be as compact as possible.
26
Junio C Hamano0430e3a2007-05-15 03:13:1727* 'short'
Junio C Hamanoa340aaa2006-11-23 02:47:3328
29 commit <sha1>
30 Author: <author>
31
32 <title line>
33
Junio C Hamano0430e3a2007-05-15 03:13:1734* 'medium'
Junio C Hamanoa340aaa2006-11-23 02:47:3335
36 commit <sha1>
37 Author: <author>
Junio C Hamano6a3c8272008-12-19 21:38:1838 Date: <author date>
Junio C Hamanoa340aaa2006-11-23 02:47:3339
40 <title line>
41
42 <full commit message>
43
Junio C Hamano0430e3a2007-05-15 03:13:1744* 'full'
Junio C Hamanoa340aaa2006-11-23 02:47:3345
46 commit <sha1>
47 Author: <author>
48 Commit: <committer>
49
50 <title line>
51
52 <full commit message>
53
Junio C Hamano0430e3a2007-05-15 03:13:1754* 'fuller'
Junio C Hamanoa340aaa2006-11-23 02:47:3355
56 commit <sha1>
Junio C Hamano6a3c8272008-12-19 21:38:1857 Author: <author>
Junio C Hamanoba4b9282008-07-06 05:20:3158 AuthorDate: <author date>
Junio C Hamano6a3c8272008-12-19 21:38:1859 Commit: <committer>
Junio C Hamanoba4b9282008-07-06 05:20:3160 CommitDate: <committer date>
Junio C Hamanoa340aaa2006-11-23 02:47:3361
62 <title line>
63
64 <full commit message>
65
Junio C Hamano0430e3a2007-05-15 03:13:1766* 'email'
Junio C Hamanoa340aaa2006-11-23 02:47:3367
68 From <sha1> <date>
69 From: <author>
Junio C Hamanoba4b9282008-07-06 05:20:3170 Date: <author date>
Junio C Hamanoa340aaa2006-11-23 02:47:3371 Subject: [PATCH] <title line>
72
Junio C Hamano0430e3a2007-05-15 03:13:1773 <full commit message>
Junio C Hamanoa340aaa2006-11-23 02:47:3374
Junio C Hamano0430e3a2007-05-15 03:13:1775* 'raw'
Junio C Hamanoa340aaa2006-11-23 02:47:3376+
77The 'raw' format shows the entire commit exactly as
78stored in the commit object. Notably, the SHA1s are
79displayed in full, regardless of whether --abbrev or
80--no-abbrev are used, and 'parents' information show the
81true parent commits, without taking grafts nor history
82simplification into account.
Junio C Hamano775a0f42006-12-31 01:19:1483
Junio C Hamanoe32ec8b2010-06-02 23:32:3184* 'format:<string>'
Junio C Hamanoa3fd83c2007-03-02 10:34:3685+
Junio C Hamanoe32ec8b2010-06-02 23:32:3186The 'format:<string>' format allows you to specify which information
Junio C Hamanoa3fd83c2007-03-02 10:34:3687you want to show. It works a little bit like printf format,
88with the notable exception that you get a newline with '%n'
89instead of '\n'.
Junio C Hamano0430e3a2007-05-15 03:13:1790+
91E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
Junio C Hamanoa3fd83c2007-03-02 10:34:3692would show something like this:
Junio C Hamano0430e3a2007-05-15 03:13:1793+
94-------
Junio C Hamanoa3fd83c2007-03-02 10:34:3695The author of fe6e0ee was Junio C Hamano, 23 hours ago
96The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
97
Junio C Hamano0430e3a2007-05-15 03:13:1798--------
99+
Junio C Hamanoa3fd83c2007-03-02 10:34:36100The placeholders are:
101
102- '%H': commit hash
103- '%h': abbreviated commit hash
104- '%T': tree hash
105- '%t': abbreviated tree hash
106- '%P': parent hashes
107- '%p': abbreviated parent hashes
108- '%an': author name
Junio C Hamano8bc410e2009-02-15 10:38:19109- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36110- '%ae': author email
Junio C Hamano8bc410e2009-02-15 10:38:19111- '%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa387df32008-08-29 08:56:58112- '%ad': author date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36113- '%aD': author date, RFC2822 style
114- '%ar': author date, relative
115- '%at': author date, UNIX timestamp
Junio C Hamano02f130b2007-07-14 08:26:56116- '%ai': author date, ISO 8601 format
Junio C Hamanoa3fd83c2007-03-02 10:34:36117- '%cn': committer name
Junio C Hamano8bc410e2009-02-15 10:38:19118- '%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36119- '%ce': committer email
Junio C Hamano8bc410e2009-02-15 10:38:19120- '%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])
Junio C Hamanoa3fd83c2007-03-02 10:34:36121- '%cd': committer date
122- '%cD': committer date, RFC2822 style
123- '%cr': committer date, relative
124- '%ct': committer date, UNIX timestamp
Junio C Hamano02f130b2007-07-14 08:26:56125- '%ci': committer date, ISO 8601 format
Junio C Hamano5e4d8de2008-09-19 06:27:02126- '%d': ref names, like the --decorate option of linkgit:git-log[1]
Junio C Hamanoa3fd83c2007-03-02 10:34:36127- '%e': encoding
128- '%s': subject
Junio C Hamano5f9a6f02009-04-06 08:26:56129- '%f': sanitized subject line, suitable for a filename
Junio C Hamanoa3fd83c2007-03-02 10:34:36130- '%b': body
Junio C Hamanocb39aea2010-05-09 07:24:48131- '%B': raw body (unwrapped subject and body)
Junio C Hamano3b70d3c2009-11-21 17:37:37132- '%N': commit notes
Junio C Hamanoc21ab052009-10-31 04:03:55133- '%gD': reflog selector, e.g., `refs/stash@\{1\}`
134- '%gd': shortened reflog selector, e.g., `stash@\{1\}`
135- '%gs': reflog subject
Junio C Hamanoa3fd83c2007-03-02 10:34:36136- '%Cred': switch color to red
137- '%Cgreen': switch color to green
138- '%Cblue': switch color to blue
139- '%Creset': reset color
Junio C Hamanocc0cb312009-01-22 03:38:50140- '%C(...)': color specification, as described in color.branch.* config option
Junio C Hamanod9e0e5d2007-04-14 16:22:04141- '%m': left, right or boundary mark
Junio C Hamanoa3fd83c2007-03-02 10:34:36142- '%n': newline
Junio C Hamanoa9701f02010-01-21 00:42:16143- '%%': a raw '%'
Junio C Hamanob78d2592008-04-09 09:39:08144- '%x00': print a byte from a hex code
Junio C Hamanobf984de2009-11-23 06:11:19145- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
Junio C Hamano5706e0b2009-11-24 10:54:16146 linkgit:git-shortlog[1].
Junio C Hamano6fb124c2008-06-13 10:04:01147
Junio C Hamanoc21ab052009-10-31 04:03:55148NOTE: Some placeholders may depend on other options given to the
149revision traversal engine. For example, the `%g*` reflog options will
150insert an empty string unless we are traversing reflog entries (e.g., by
151`git log -g`). The `%d` placeholder will use the "short" decoration
152format if `--decorate` was not already provided on the command line.
153
Junio C Hamano2bd8a742009-12-01 21:16:59154If you add a `{plus}` (plus sign) after '%' of a placeholder, a line-feed
155is inserted immediately before the expansion if and only if the
156placeholder expands to a non-empty string.
157
158If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
159immediately precede the expansion are deleted if and only if the
160placeholder expands to an empty string.
161
Junio C Hamano89a57342010-06-22 23:22:55162If you add a ` ` (space) after '%' of a placeholder, a space
163is inserted immediately before the expansion if and only if the
164placeholder expands to a non-empty string.
165
Junio C Hamano6fb124c2008-06-13 10:04:01166* 'tformat:'
167+
168The 'tformat:' format works exactly like 'format:', except that it
169provides "terminator" semantics instead of "separator" semantics. In
170other words, each commit has the message terminator character (usually a
171newline) appended, rather than a separator placed between entries.
172This means that the final entry of a single-line format will be properly
173terminated with a new line, just as the "oneline" format does.
174For example:
175+
176---------------------
177$ git log -2 --pretty=format:%h 4da45bef \
178 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1794da45be
1807134973 -- NO NEWLINE
181
182$ git log -2 --pretty=tformat:%h 4da45bef \
183 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1844da45be
1857134973
186---------------------
Junio C Hamano0a235222009-03-06 08:21:09187+
188In addition, any unrecognized string that has a `%` in it is interpreted
189as if it has `tformat:` in front of it. For example, these two are
190equivalent:
191+
192---------------------
193$ git log -2 --pretty=tformat:%h 4da45bef
194$ git log -2 --pretty=%h 4da45bef
195---------------------