]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-log.txt
Merge branch 'tb/ci-run-cocci-with-18.04' into maint
[thirdparty/git.git] / Documentation / git-log.txt
CommitLineData
215a7ad1
JH
1git-log(1)
2==========
3f971fc4
JH
3
4NAME
5----
215a7ad1 6git-log - Show commit logs
3f971fc4
JH
7
8
9SYNOPSIS
10--------
7791a1d9 11[verse]
933c758c 12'git log' [<options>] [<revision range>] [[--] <path>...]
3f971fc4
JH
13
14DESCRIPTION
15-----------
e51c3b50
JH
16Shows the commit logs.
17
bea86658
PB
18:git-log: 1
19include::rev-list-description.txt[]
20
f8f28ed9 21The command takes options applicable to the linkgit:git-rev-list[1]
e51c3b50 22command to control what is shown and how, and options applicable to
f8f28ed9 23the linkgit:git-diff[1] command to control how the changes
e51c3b50
JH
24each commit introduces are shown.
25
3f971fc4
JH
26
27OPTIONS
28-------
5d1faf87 29
4ded6916
EB
30--follow::
31 Continue listing the history of a file beyond renames
32 (works only for a single file).
33
8a3d203b 34--no-decorate::
462cbb41 35--decorate[=short|full|auto|no]::
33e7018c
LH
36 Print out the ref names of any commits that are shown. If 'short' is
37 specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
38 'refs/remotes/' will not be printed. If 'full' is specified, the
462cbb41
RJ
39 full ref name (including prefix) will be printed. If 'auto' is
40 specified, then if the output is going to a terminal, the ref names
41 are shown as if 'short' were given, otherwise no ref names are
42 shown. The default option is 'short'.
56822cc9 43
65516f58
RA
44--decorate-refs=<pattern>::
45--decorate-refs-exclude=<pattern>::
46 If no `--decorate-refs` is given, pretend as if all refs were
47 included. For each candidate, do not use it for decoration if it
48 matches any patterns given to `--decorate-refs-exclude` or if it
a6be5e67
DS
49 doesn't match any of the patterns given to `--decorate-refs`. The
50 `log.excludeDecoration` config option allows excluding refs from
51 the decorations, but an explicit `--decorate-refs` pattern will
52 override a match in `log.excludeDecoration`.
65516f58 53
30c4d7a7
NS
54--source::
55 Print out the ref name given on the command line by which each
56 commit was reached.
57
88acccda 58--[no-]mailmap::
2d9c5690 59--[no-]use-mailmap::
ea57bc0d 60 Use mailmap file to map author and committer names and email
b20cc13e 61 addresses to canonical real names and email addresses. See
ea57bc0d
AP
62 linkgit:git-shortlog[1].
63
2e88c266 64--full-diff::
b20cc13e 65 Without this flag, `git log -p <path>...` shows commits that
2e88c266
JN
66 touch the specified paths, and diffs about the same specified
67 paths. With this, the full diff is shown for commits that touch
f448e24e 68 the specified paths; this means that "<path>..." limits only
2e88c266 69 commits, and doesn't limit diff for those commits.
b1c7946d
MG
70+
71Note that this affects all diff-based output types, e.g. those
b20cc13e 72produced by `--stat`, etc.
2e88c266 73
9fa3465d 74--log-size::
c20e6fb1
JSJ
75 Include a line ``log size <number>'' in the output for each commit,
76 where <number> is the length of that commit's message in bytes.
77 Intended to speed up tools that read log messages from `git log`
78 output by allowing them to allocate space in advance.
9fa3465d 79
f9c8d8cb 80include::line-range-options.txt[]
12da1d1f 81
21a40b90
RR
82<revision range>::
83 Show only commits in the specified revision range. When no
84 <revision range> is specified, it defaults to `HEAD` (i.e. the
85 whole history leading to the current commit). `origin..HEAD`
86 specifies all the commits reachable from the current commit
87 (i.e. `HEAD`), but not from `origin`. For a complete list of
b20cc13e 88 ways to spell <revision range>, see the 'Specifying Ranges'
21a40b90 89 section of linkgit:gitrevisions[7].
a682187e 90
933c758c 91[--] <path>...::
b15b5b10 92 Show only commits that are enough to explain how the files
b20cc13e
JSJ
93 that match the specified paths came to be. See 'History
94 Simplification' below for details and other simplification
b15b5b10
TR
95 modes.
96+
6955047f 97Paths may need to be prefixed with `--` to separate them from
00200e9e 98options or the revision range, when confusion arises.
e51c3b50 99
f98fd436
MG
100include::rev-list-options.txt[]
101
102include::pretty-formats.txt[]
103
6f2e02ae
JK
104DIFF FORMATTING
105---------------
106
107By default, `git log` does not generate any diff output. The options
108below can be used to show the changes made by each commit.
109
5fbb4bc1
JK
110Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits
111will never show a diff, even if a diff format like `--patch` is
112selected, nor will they match search options like `-S`. The exception is
113when `--first-parent` is in use, in which merges are treated like normal
114single-parent commits (this can be overridden by providing a
115combined-diff option or with `--no-diff-merges`).
116
6f2e02ae
JK
117-c::
118 With this option, diff output for a merge commit
119 shows the differences from each of the parents to the merge result
120 simultaneously instead of showing pairwise diff between a parent
121 and the result one at a time. Furthermore, it lists only files
122 which were modified from all parents.
123
124--cc::
125 This flag implies the `-c` option and further compresses the
126 patch output by omitting uninteresting hunks whose contents in
127 the parents have only two variants and the merge result picks
128 one of them without modification.
129
130--combined-all-paths::
131 This flag causes combined diffs (used for merge commits) to
132 list the name of the file from all parents. It thus only has
133 effect when -c or --cc are specified, and is likely only
134 useful if filename changes are detected (i.e. when either
135 rename or copy detection have been requested).
136
137-m::
6f2e02ae
JK
138 This flag makes the merge commits show the full diff like
139 regular commits; for each merge parent, a separate log entry
140 and diff is generated. An exception is that only diff against
141 the first parent is shown when `--first-parent` option is given;
142 in that case, the output represents the changes the merge
143 brought _into_ the then-current branch.
4ded6916 144
405a2fdf
SO
145--diff-merges=off::
146--no-diff-merges::
147 Disable output of diffs for merge commits (default). Useful to
148 override `-m`, `-c`, or `--cc`.
149
4ded6916
EB
150:git-log: 1
151include::diff-options.txt[]
331b51d2 152
272bd3cf 153include::diff-generate-patch.txt[]
331b51d2 154
4ba258b7 155EXAMPLES
bd663611 156--------
5d2fc913 157`git log --no-merges`::
bd663611
LT
158
159 Show the whole commit history, but skip any merges
160
5d2fc913 161`git log v2.6.12.. include/scsi drivers/scsi`::
bd663611
LT
162
163 Show all commits since version 'v2.6.12' that changed any file
b20cc13e 164 in the `include/scsi` or `drivers/scsi` subdirectories
bd663611 165
6cf378f0 166`git log --since="2 weeks ago" -- gitk`::
bd663611
LT
167
168 Show the changes during the last two weeks to the file 'gitk'.
6955047f 169 The `--` is necessary to avoid confusion with the *branch* named
bd663611
LT
170 'gitk'
171
5d2fc913 172`git log --name-status release..test`::
e51c3b50
JH
173
174 Show the commits that are in the "test" branch but not yet
175 in the "release" branch, along with the list of paths
176 each commit modifies.
bd663611 177
09b7e220 178`git log --follow builtin/rev-list.c`::
4f50f6a9 179
b20cc13e 180 Shows the commits that changed `builtin/rev-list.c`, including
4f50f6a9
SW
181 those commits that occurred before the file was given its
182 present name.
183
5d2fc913 184`git log --branches --not --remotes=origin`::
d08bae7e
IL
185
186 Shows all commits that are in any of local branches but not in
0e615b25 187 any of remote-tracking branches for 'origin' (what you have that
d08bae7e
IL
188 origin doesn't).
189
5d2fc913 190`git log master --not --remotes=*/master`::
d08bae7e
IL
191
192 Shows all commits that are in local master but not in any remote
193 repository master branches.
194
5d2fc913 195`git log -p -m --first-parent`::
88d9d45d
PB
196
197 Shows the history including change diffs, but only from the
b20cc13e 198 ``main branch'' perspective, skipping commits that come from merged
88d9d45d
PB
199 branches, and showing full diffs of changes introduced by the merges.
200 This makes sense only when following a strict policy of merging all
201 topic branches when staying on a single integration branch.
202
001b0976 203`git log -L '/int main/',/^}/:main.c`::
12da1d1f 204
b20cc13e 205 Shows how the function `main()` in the file `main.c` evolved
12da1d1f
TR
206 over time.
207
70c2a258 208`git log -3`::
b20cc13e 209
70c2a258 210 Limits the number of commits to show to 3.
88d9d45d 211
4ba258b7 212DISCUSSION
5dc7bcc2
JH
213----------
214
215include::i18n.txt[]
216
4ba258b7 217CONFIGURATION
59893a88
JN
218-------------
219
220See linkgit:git-config[1] for core variables and linkgit:git-diff[1]
221for settings related to diff generation.
222
223format.pretty::
b20cc13e
JSJ
224 Default for the `--format` option. (See 'Pretty Formats' above.)
225 Defaults to `medium`.
59893a88
JN
226
227i18n.logOutputEncoding::
b20cc13e
JSJ
228 Encoding to use when displaying logs. (See 'Discussion' above.)
229 Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
59893a88
JN
230 otherwise.
231
232log.date::
233 Default format for human-readable dates. (Compare the
234 `--date` option.) Defaults to "default", which means to write
235 dates like `Sat May 8 19:35:34 2010 -0500`.
038a8788
SS
236+
237If the format is set to "auto:foo" and the pager is in use, format
238"foo" will be the used for the date format. Otherwise "default" will
239be used.
59893a88 240
076c9837 241log.follow::
fd8d07ef
EVW
242 If `true`, `git log` will act as if the `--follow` option was used when
243 a single <path> is given. This has the same limitations as `--follow`,
244 i.e. it cannot be used to follow multiple files and does not work well
245 on non-linear history.
076c9837 246
da0005b8 247log.showRoot::
b20cc13e 248 If `false`, `git log` and related commands will not treat the
59893a88
JN
249 initial commit as a big creation event. Any root commits in
250 `git log -p` output would be shown without a diff attached.
251 The default is `true`.
252
fce04c3c
MJ
253log.showSignature::
254 If `true`, `git log` and related commands will act as if the
255 `--show-signature` option was passed to them.
256
d5422b0c 257mailmap.*::
59893a88
JN
258 See linkgit:git-shortlog[1].
259
260notes.displayRef::
261 Which refs, in addition to the default set by `core.notesRef`
eee7f4a2 262 or `GIT_NOTES_REF`, to read notes from when showing commit
b20cc13e 263 messages with the `log` family of commands. See
59893a88
JN
264 linkgit:git-notes[1].
265+
266May be an unabbreviated ref name or a glob and may be specified
267multiple times. A warning will be issued for refs that do not exist,
268but a glob that does not match any refs is silently ignored.
269+
ab18b2c0 270This setting can be disabled by the `--no-notes` option,
eee7f4a2 271overridden by the `GIT_NOTES_DISPLAY_REF` environment variable,
ab18b2c0 272and overridden by the `--notes=<ref>` option.
5dc7bcc2 273
3f971fc4
JH
274GIT
275---
9e1f0a85 276Part of the linkgit:git[1] suite