]>
Commit | Line | Data |
---|---|---|
331b51d2 JN |
1 | PRETTY FORMATS |
2 | -------------- | |
3 | ||
4 | If the commit is a merge, and if the pretty-format | |
5 | is not 'oneline', 'email' or 'raw', an additional line is | |
6 | inserted before the 'Author:' line. This line begins with | |
7 | "Merge: " and the sha1s of ancestral commits are printed, | |
8 | separated by spaces. Note that the listed commits may not | |
9 | necessarily be the list of the *direct* parent commits if you | |
10 | have limited your view of history: for example, if you are | |
11 | only interested in changes related to a certain directory or | |
12 | file. | |
13 | ||
14 | Here are some additional details for each format: | |
15 | ||
16 | * 'oneline' | |
5d1faf87 CR |
17 | |
18 | <sha1> <title line> | |
19 | + | |
20 | This is designed to be as compact as possible. | |
21 | ||
331b51d2 | 22 | * 'short' |
5d1faf87 CR |
23 | |
24 | commit <sha1> | |
25 | Author: <author> | |
26 | ||
27 | <title line> | |
28 | ||
331b51d2 | 29 | * 'medium' |
5d1faf87 CR |
30 | |
31 | commit <sha1> | |
32 | Author: <author> | |
33 | Date: <date> | |
34 | ||
35 | <title line> | |
36 | ||
37 | <full commit message> | |
38 | ||
331b51d2 | 39 | * 'full' |
5d1faf87 CR |
40 | |
41 | commit <sha1> | |
42 | Author: <author> | |
43 | Commit: <committer> | |
44 | ||
45 | <title line> | |
46 | ||
47 | <full commit message> | |
48 | ||
331b51d2 | 49 | * 'fuller' |
5d1faf87 CR |
50 | |
51 | commit <sha1> | |
52 | Author: <author> | |
53 | AuthorDate: <date & time> | |
54 | Commit: <committer> | |
55 | CommitDate: <date & time> | |
56 | ||
57 | <title line> | |
58 | ||
59 | <full commit message> | |
60 | ||
331b51d2 | 61 | * 'email' |
5d1faf87 CR |
62 | |
63 | From <sha1> <date> | |
64 | From: <author> | |
65 | Date: <date & time> | |
66 | Subject: [PATCH] <title line> | |
67 | ||
331b51d2 | 68 | <full commit message> |
5d1faf87 | 69 | |
331b51d2 | 70 | * 'raw' |
5d1faf87 CR |
71 | + |
72 | The 'raw' format shows the entire commit exactly as | |
73 | stored in the commit object. Notably, the SHA1s are | |
74 | displayed in full, regardless of whether --abbrev or | |
75 | --no-abbrev are used, and 'parents' information show the | |
76 | true parent commits, without taking grafts nor history | |
77 | simplification into account. | |
7cbcf4d5 | 78 | |
331b51d2 | 79 | * 'format:' |
e52a5de4 JS |
80 | + |
81 | The 'format:' format allows you to specify which information | |
82 | you want to show. It works a little bit like printf format, | |
83 | with the notable exception that you get a newline with '%n' | |
84 | instead of '\n'. | |
331b51d2 JN |
85 | + |
86 | E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"' | |
e52a5de4 | 87 | would show something like this: |
331b51d2 JN |
88 | + |
89 | ------- | |
e52a5de4 JS |
90 | The author of fe6e0ee was Junio C Hamano, 23 hours ago |
91 | The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< | |
92 | ||
331b51d2 JN |
93 | -------- |
94 | + | |
e52a5de4 JS |
95 | The 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 | |
104 | - '%ae': author email | |
105 | - '%ad': author date | |
106 | - '%aD': author date, RFC2822 style | |
107 | - '%ar': author date, relative | |
108 | - '%at': author date, UNIX timestamp | |
109 | - '%cn': committer name | |
110 | - '%ce': committer email | |
111 | - '%cd': committer date | |
112 | - '%cD': committer date, RFC2822 style | |
113 | - '%cr': committer date, relative | |
114 | - '%ct': committer date, UNIX timestamp | |
115 | - '%e': encoding | |
116 | - '%s': subject | |
117 | - '%b': body | |
118 | - '%Cred': switch color to red | |
119 | - '%Cgreen': switch color to green | |
120 | - '%Cblue': switch color to blue | |
121 | - '%Creset': reset color | |
199c45bf | 122 | - '%m': left, right or boundary mark |
e52a5de4 JS |
123 | - '%n': newline |
124 |