]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/rev-list-options.txt
Merge branch 'ea/blame-use-oideq'
[thirdparty/git.git] / Documentation / rev-list-options.txt
CommitLineData
fdcf39e5
MV
1Commit Limiting
2~~~~~~~~~~~~~~~
3
4Besides specifying a range of commits that should be listed using the
5special notations explained in the description, additional commit
a23e3138
JH
6limiting may be applied.
7
8Using more options generally further limits the output (e.g.
9`--since=<date1>` limits to commits newer than `<date1>`, and using it
10with `--grep=<pattern>` further limits to commits whose log message
11has a line that matches `<pattern>`), unless otherwise noted.
12
13Note that these are applied before commit
14ordering and formatting options, such as `--reverse`.
fdcf39e5 15
70c2a258
NTND
16-<number>::
17-n <number>::
982962ce 18--max-count=<number>::
841d8118 19 Limit the number of commits to output.
fdcf39e5 20
982962ce 21--skip=<number>::
fdcf39e5
MV
22 Skip 'number' commits before starting to show the commit output.
23
982962ce
MM
24--since=<date>::
25--after=<date>::
fdcf39e5
MV
26 Show commits more recent than a specific date.
27
982962ce
MM
28--until=<date>::
29--before=<date>::
fdcf39e5
MV
30 Show commits older than a specific date.
31
56b6d01d 32ifdef::git-rev-list[]
982962ce
MM
33--max-age=<timestamp>::
34--min-age=<timestamp>::
fdcf39e5 35 Limit the commits output to specified time range.
56b6d01d 36endif::git-rev-list[]
fdcf39e5 37
982962ce
MM
38--author=<pattern>::
39--committer=<pattern>::
fdcf39e5 40 Limit the commits output to ones with author/committer
a23e3138
JH
41 header lines that match the specified pattern (regular
42 expression). With more than one `--author=<pattern>`,
43 commits whose author matches any of the given patterns are
44 chosen (similarly for multiple `--committer=<pattern>`).
fdcf39e5 45
72fd13f7 46--grep-reflog=<pattern>::
72fd13f7
NTND
47 Limit the commits output to ones with reflog entries that
48 match the specified pattern (regular expression). With
49 more than one `--grep-reflog`, commits whose reflog message
baa6378f
JH
50 matches any of the given patterns are chosen. It is an
51 error to use this option unless `--walk-reflogs` is in use.
72fd13f7 52
982962ce 53--grep=<pattern>::
fdcf39e5 54 Limit the commits output to ones with log message that
a23e3138
JH
55 matches the specified pattern (regular expression). With
56 more than one `--grep=<pattern>`, commits whose message
57 matches any of the given patterns are chosen (but see
58 `--all-match`).
2aea7a51 59ifndef::git-rev-list[]
38cfe915 60+
9d45ac4c 61When `--notes` is in effect, the message from the notes is
7348cdeb 62matched as if it were part of the log message.
2aea7a51 63endif::git-rev-list[]
fdcf39e5 64
7756ba74 65--all-match::
4528aa1a 66 Limit the commits output to ones that match all given `--grep`,
a23e3138 67 instead of ones that match at least one.
7756ba74 68
22dfa8a2
CJ
69--invert-grep::
70 Limit the commits output to ones with log message that do not
71 match the pattern specified with `--grep=<pattern>`.
72
3240240f
SB
73-i::
74--regexp-ignore-case::
19d6eb41
JSJ
75 Match the regular expression limiting patterns without regard to letter
76 case.
fdcf39e5 77
727b6fc3 78--basic-regexp::
727b6fc3
JH
79 Consider the limiting patterns to be basic regular expressions;
80 this is the default.
81
3240240f
SB
82-E::
83--extended-regexp::
fdcf39e5
MV
84 Consider the limiting patterns to be extended regular expressions
85 instead of the default basic regular expressions.
86
3240240f
SB
87-F::
88--fixed-strings::
dc1c0fff
JN
89 Consider the limiting patterns to be fixed strings (don't interpret
90 pattern as a regular expression).
91
7531a2dd 92-P::
727b6fc3 93--perl-regexp::
d048cb13
ÆAB
94 Consider the limiting patterns to be Perl-compatible regular
95 expressions.
96+
97Support for these types of regular expressions is an optional
98compile-time dependency. If Git wasn't compiled with support for them
99providing this option will cause it to die.
727b6fc3 100
fdcf39e5 101--remove-empty::
fdcf39e5
MV
102 Stop when a given path disappears from the tree.
103
2657420d 104--merges::
6a6ebded 105 Print only merge commits. This is exactly the same as `--min-parents=2`.
2657420d 106
fdcf39e5 107--no-merges::
6a6ebded
MG
108 Do not print commits with more than one parent. This is
109 exactly the same as `--max-parents=1`.
110
111--min-parents=<number>::
112--max-parents=<number>::
113--no-min-parents::
114--no-max-parents::
5104d21f 115 Show only commits which have at least (or at most) that many parent
6a6ebded
MG
116 commits. In particular, `--max-parents=1` is the same as `--no-merges`,
117 `--min-parents=2` is the same as `--merges`. `--max-parents=0`
118 gives all root commits and `--min-parents=3` all octopus merges.
119+
120`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
121again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
122parents) and `--max-parents=-1` (negative numbers denote no upper limit).
fdcf39e5
MV
123
124--first-parent::
125 Follow only the first parent commit upon seeing a merge
126 commit. This option can give a better overview when
127 viewing the evolution of a particular topic branch,
128 because merges into a topic branch tend to be only about
129 adjusting to updated upstream from time to time, and
130 this option allows you to ignore the individual commits
0fe305a5 131 brought in to your history by such a merge.
fdcf39e5
MV
132
133--not::
fdcf39e5 134 Reverses the meaning of the '{caret}' prefix (or lack thereof)
4528aa1a 135 for all following revision specifiers, up to the next `--not`.
fdcf39e5
MV
136
137--all::
209df269
NTND
138 Pretend as if all the refs in `refs/`, along with `HEAD`, are
139 listed on the command line as '<commit>'.
c2e6385d 140
62b4698e 141--branches[=<pattern>]::
cc1b8d8b 142 Pretend as if all the refs in `refs/heads` are listed
62b4698e 143 on the command line as '<commit>'. If '<pattern>' is given, limit
b09fe971 144 branches to ones matching given shell glob. If pattern lacks '?',
e34bb2e7 145 '{asterisk}', or '[', '/{asterisk}' at the end is implied.
c2e6385d 146
62b4698e 147--tags[=<pattern>]::
cc1b8d8b 148 Pretend as if all the refs in `refs/tags` are listed
62b4698e 149 on the command line as '<commit>'. If '<pattern>' is given, limit
e34bb2e7
CMN
150 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
151 or '[', '/{asterisk}' at the end is implied.
c2e6385d 152
62b4698e 153--remotes[=<pattern>]::
cc1b8d8b 154 Pretend as if all the refs in `refs/remotes` are listed
62b4698e 155 on the command line as '<commit>'. If '<pattern>' is given, limit
0e615b25 156 remote-tracking branches to ones matching given shell glob.
e34bb2e7 157 If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
fdcf39e5 158
62b4698e
ŠN
159--glob=<glob-pattern>::
160 Pretend as if all the refs matching shell glob '<glob-pattern>'
d08bae7e 161 are listed on the command line as '<commit>'. Leading 'refs/',
e34bb2e7
CMN
162 is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
163 or '[', '/{asterisk}' at the end is implied.
d08bae7e 164
574d370b
JS
165--exclude=<glob-pattern>::
166
167 Do not include refs matching '<glob-pattern>' that the next `--all`,
168 `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
169 consider. Repetitions of this option accumulate exclusion patterns
170 up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
171 `--glob` option (other options or arguments do not clear
f745acb0 172 accumulated patterns).
574d370b
JS
173+
174The patterns given should not begin with `refs/heads`, `refs/tags`, or
175`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
176respectively, and they must begin with `refs/` when applied to `--glob`
177or `--all`. If a trailing '/{asterisk}' is intended, it must be given
178explicitly.
179
41d018d1
JK
180--reflog::
181 Pretend as if all objects mentioned by reflogs are listed on the
182 command line as `<commit>`.
183
39b44ba7
JK
184--alternate-refs::
185 Pretend as if all objects mentioned as ref tips of alternate
186 repositories were listed on the command line. An alternate
187 repository is any repository whose object directory is specified
188 in `objects/info/alternates`. The set of included objects may
189 be modified by `core.alternateRefsCommand`, etc. See
190 linkgit:git-config[1].
191
32619f99
NTND
192--single-worktree::
193 By default, all working trees will be examined by the
194 following options when there are more than one (see
195 linkgit:git-worktree[1]): `--all`, `--reflog` and
196 `--indexed-objects`.
197 This option forces them to examine the current working tree
198 only.
199
cc243c3c 200--ignore-missing::
cc243c3c
JH
201 Upon seeing an invalid object name in the input, pretend as if
202 the bad input was not given.
d08bae7e 203
af06e93a
CC
204ifndef::git-rev-list[]
205--bisect::
cc1b8d8b 206 Pretend as if the bad bisection ref `refs/bisect/bad`
af06e93a 207 was listed and as if it was followed by `--not` and the good
cc1b8d8b 208 bisection refs `refs/bisect/good-*` on the command
0fe305a5 209 line.
af06e93a
CC
210endif::git-rev-list[]
211
fdcf39e5 212--stdin::
fdcf39e5 213 In addition to the '<commit>' listed on the command
04b125de 214 line, read them from the standard input. If a `--` separator is
60da8b15
JH
215 seen, stop reading commits and start reading paths to limit the
216 result.
fdcf39e5 217
8b3dce56 218ifdef::git-rev-list[]
fdcf39e5 219--quiet::
fdcf39e5
MV
220 Don't print anything to standard output. This form
221 is primarily meant to allow the caller to
222 test the exit status to see if a range of objects is fully
223 connected (or not). It is faster than redirecting stdout
4528aa1a 224 to `/dev/null` as the output does not have to be formatted.
adf60f14 225endif::git-rev-list[]
fdcf39e5 226
cb56e309 227--cherry-mark::
cb56e309
MG
228 Like `--cherry-pick` (see below) but mark equivalent commits
229 with `=` rather than omitting them, and inequivalent ones with `+`.
230
fdcf39e5 231--cherry-pick::
fdcf39e5 232 Omit any commit that introduces the same change as
4528aa1a 233 another commit on the ``other side'' when the set of
fdcf39e5
MV
234 commits are limited with symmetric difference.
235+
236For example, if you have two branches, `A` and `B`, a usual way
237to list all commits on only one side of them is with
3add01bb 238`--left-right` (see the example below in the description of
19d6eb41
JSJ
239the `--left-right` option). However, it shows the commits that were
240cherry-picked from the other branch (for example, ``3rd on b'' may be
241cherry-picked from branch A). With this option, such pairs of commits are
fdcf39e5
MV
242excluded from the output.
243
59c8afdf
MG
244--left-only::
245--right-only::
27ac8371 246 List only commits on the respective side of a symmetric difference,
59c8afdf
MG
247 i.e. only those which would be marked `<` resp. `>` by
248 `--left-right`.
249+
250For example, `--cherry-pick --right-only A...B` omits those
251commits from `B` which are in `A` or are patch-equivalent to a commit in
6cf378f0 252`A`. In other words, this lists the `+` commits from `git cherry A B`.
59c8afdf
MG
253More precisely, `--cherry-pick --right-only --no-merges` gives the exact
254list.
255
94f605ec 256--cherry::
94f605ec
MG
257 A synonym for `--right-only --cherry-mark --no-merges`; useful to
258 limit the output to the commits on our side and mark those that
259 have been applied to the other side of a forked history with
260 `git log --cherry upstream...mybranch`, similar to
261 `git cherry upstream mybranch`.
262
3240240f
SB
263-g::
264--walk-reflogs::
fdcf39e5
MV
265 Instead of walking the commit ancestry chain, walk
266 reflog entries from the most recent one to older ones.
267 When this option is used you cannot specify commits to
268 exclude (that is, '{caret}commit', 'commit1..commit2',
a58088ab 269 and 'commit1\...commit2' notations cannot be used).
fdcf39e5 270+
1f0fc1db 271With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
fdcf39e5 272this causes the output to have two extra lines of information
83c9f95c
JK
273taken from the reflog. The reflog designator in the output may be shown
274as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
275reflog) or as `ref@{timestamp}` (with the timestamp for that entry),
276depending on a few rules:
277+
278--
2791. If the starting point is specified as `ref@{Nth}`, show the index
ba170517 280 format.
83c9f95c
JK
281+
2822. If the starting point was specified as `ref@{now}`, show the
ba170517 283 timestamp format.
83c9f95c
JK
284+
2853. If neither was used, but `--date` was given on the command line, show
ba170517 286 the timestamp in the format requested by `--date`.
83c9f95c
JK
287+
2884. Otherwise, show the index format.
289--
290+
291Under `--pretty=oneline`, the commit message is
fdcf39e5 292prefixed with this information on the same line.
4528aa1a 293This option cannot be combined with `--reverse`.
fdcf39e5 294See also linkgit:git-reflog[1].
1f0fc1db
DL
295+
296Under `--pretty=reference`, this information will not be shown at all.
fdcf39e5
MV
297
298--merge::
fdcf39e5
MV
299 After a failed merge, show refs that touch files having a
300 conflict and don't exist on all heads to merge.
301
302--boundary::
e32db66d
KB
303 Output excluded boundary commits. Boundary commits are
304 prefixed with `-`.
fdcf39e5 305
aa32939f
VM
306ifdef::git-rev-list[]
307--use-bitmap-index::
308
309 Try to speed up the traversal using the pack bitmap index (if
310 one is available). Note that when traversing with `--objects`,
311 trees and blobs will not have their associated path printed.
434ea3cd
JK
312
313--progress=<header>::
314 Show progress reports on stderr as objects are considered. The
315 `<header>` text will be printed with each progress update.
aa32939f
VM
316endif::git-rev-list[]
317
70d9895e
TR
318History Simplification
319~~~~~~~~~~~~~~~~~~~~~~
320
7bc2508b
SB
321Sometimes you are only interested in parts of the history, for example the
322commits modifying a particular <path>. But there are two parts of
323'History Simplification', one part is selecting the commits and the other
324is how to do it, as there are various strategies to simplify the history.
325
326The following options select the commits to be shown:
327
328<paths>::
7bc2508b
SB
329 Commits modifying the given <paths> are selected.
330
331--simplify-by-decoration::
7bc2508b
SB
332 Commits that are referred by some branch or tag are selected.
333
334Note that extra commits can be shown to give a meaningful history.
335
336The following options affect the way the simplification is performed:
337
338Default mode::
7bc2508b
SB
339 Simplifies the history to the simplest history explaining the
340 final state of the tree. Simplest because it prunes some side
341 branches if the end result is the same (i.e. merging branches
342 with the same content)
343
8d049e18
DS
344--show-pulls::
345 Include all commits from the default mode, but also any merge
346 commits that are not TREESAME to the first parent but are
347 TREESAME to a later parent. This mode is helpful for showing
348 the merge commits that "first introduced" a change to a branch.
349
7bc2508b 350--full-history::
df6b0cad 351 Same as the default mode, but does not prune some history.
7bc2508b
SB
352
353--dense::
7bc2508b
SB
354 Only the selected commits are shown, plus some to have a
355 meaningful history.
356
357--sparse::
7bc2508b
SB
358 All commits in the simplified history are shown.
359
360--simplify-merges::
4528aa1a 361 Additional option to `--full-history` to remove some needless
7bc2508b
SB
362 merges from the resulting history, as there are no selected
363 commits contributing to this merge.
364
57456ef4 365--ancestry-path::
57456ef4
JH
366 When given a range of commits to display (e.g. 'commit1..commit2'
367 or 'commit2 {caret}commit1'), only display commits that exist
368 directly on the ancestry chain between the 'commit1' and
369 'commit2', i.e. commits that are both descendants of 'commit1',
370 and ancestors of 'commit2'.
371
7bc2508b 372A more detailed explanation follows.
70d9895e
TR
373
374Suppose you specified `foo` as the <paths>. We shall call commits
375that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
376filtered for `foo`, they look different and equal, respectively.)
377
378In the following, we will always refer to the same example history to
379illustrate the differences between simplification settings. We assume
380that you are filtering for a file `foo` in this commit graph:
381-----------------------------------------------------------------------
143f1eaf
KB
382 .-A---M---N---O---P---Q
383 / / / / / /
384 I B C D E Y
385 \ / / / / /
386 `-------------' X
70d9895e 387-----------------------------------------------------------------------
143f1eaf 388The horizontal line of history A---Q is taken to be the first parent of
70d9895e
TR
389each merge. The commits are:
390
391* `I` is the initial commit, in which `foo` exists with contents
4528aa1a 392 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
70d9895e
TR
393 commits are compared to an empty tree, so `I` is !TREESAME.
394
4528aa1a 395* In `A`, `foo` contains just ``foo''.
70d9895e
TR
396
397* `B` contains the same change as `A`. Its merge `M` is trivial and
398 hence TREESAME to all parents.
399
4528aa1a 400* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
70d9895e
TR
401 so it is not TREESAME to any parent.
402
4528aa1a
JSJ
403* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
404 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
70d9895e 405
4528aa1a
JSJ
406* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
407 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
70d9895e 408
17b83d71 409* `X` is an independent root commit that added a new file `side`, and `Y`
143f1eaf
KB
410 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
411 `Q` is TREESAME to `P`, but not to `Y`.
412
4528aa1a
JSJ
413`rev-list` walks backwards through history, including or excluding
414commits based on whether `--full-history` and/or parent rewriting
415(via `--parents` or `--children`) are used. The following settings
70d9895e
TR
416are available.
417
418Default mode::
70d9895e 419 Commits are included if they are not TREESAME to any parent
4528aa1a 420 (though this can be changed, see `--sparse` below). If the
70d9895e
TR
421 commit was a merge, and it was TREESAME to one parent, follow
422 only that parent. (Even if there are several TREESAME
423 parents, follow only one of them.) Otherwise, follow all
424 parents.
425+
426This results in:
427+
428-----------------------------------------------------------------------
429 .-A---N---O
f70d0586 430 / / /
70d9895e
TR
431 I---------D
432-----------------------------------------------------------------------
433+
434Note how the rule to only follow the TREESAME parent, if one is
435available, removed `B` from consideration entirely. `C` was
436considered via `N`, but is TREESAME. Root commits are compared to an
437empty tree, so `I` is !TREESAME.
438+
4528aa1a 439Parent/child relations are only visible with `--parents`, but that does
70d9895e
TR
440not affect the commits selected in default mode, so we have shown the
441parent lines.
442
443--full-history without parent rewriting::
70d9895e
TR
444 This mode differs from the default in one point: always follow
445 all parents of a merge, even if it is TREESAME to one of them.
446 Even if more than one side of the merge has commits that are
447 included, this does not imply that the merge itself is! In
448 the example, we get
449+
450-----------------------------------------------------------------------
143f1eaf 451 I A B N D O P Q
70d9895e
TR
452-----------------------------------------------------------------------
453+
d0af663e 454`M` was excluded because it is TREESAME to both parents. `E`,
70d9895e
TR
455`C` and `B` were all walked, but only `B` was !TREESAME, so the others
456do not appear.
457+
458Note that without parent rewriting, it is not really possible to talk
459about the parent/child relationships between the commits, so we show
460them disconnected.
461
462--full-history with parent rewriting::
70d9895e 463 Ordinary commits are only included if they are !TREESAME
4528aa1a 464 (though this can be changed, see `--sparse` below).
70d9895e
TR
465+
466Merges are always included. However, their parent list is rewritten:
467Along each parent, prune away commits that are not included
468themselves. This results in
469+
470-----------------------------------------------------------------------
143f1eaf 471 .-A---M---N---O---P---Q
70d9895e
TR
472 / / / / /
473 I B / D /
474 \ / / / /
475 `-------------'
476-----------------------------------------------------------------------
477+
4528aa1a 478Compare to `--full-history` without rewriting above. Note that `E`
70d9895e
TR
479was pruned away because it is TREESAME, but the parent list of P was
480rewritten to contain `E`'s parent `I`. The same happened for `C` and
143f1eaf 481`N`, and `X`, `Y` and `Q`.
70d9895e
TR
482
483In addition to the above settings, you can change whether TREESAME
484affects inclusion:
485
3240240f 486--dense::
70d9895e
TR
487 Commits that are walked are included if they are not TREESAME
488 to any parent.
489
3240240f 490--sparse::
70d9895e
TR
491 All commits that are walked are included.
492+
4528aa1a 493Note that without `--full-history`, this still simplifies merges: if
70d9895e
TR
494one of the parents is TREESAME, we follow only that one, so the other
495sides of the merge are never walked.
fdcf39e5 496
d266a988 497--simplify-merges::
d266a988 498 First, build a history graph in the same way that
4528aa1a 499 `--full-history` with parent rewriting does (see above).
d266a988
TR
500+
501Then simplify each commit `C` to its replacement `C'` in the final
502history according to the following rules:
503+
504--
505* Set `C'` to `C`.
506+
507* Replace each parent `P` of `C'` with its simplification `P'`. In
143f1eaf
KB
508 the process, drop parents that are ancestors of other parents or that are
509 root commits TREESAME to an empty tree, and remove duplicates, but take care
510 to never drop all parents that we are TREESAME to.
d266a988
TR
511+
512* If after this parent rewriting, `C'` is a root or merge commit (has
513 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
514 Otherwise, it is replaced with its only parent.
515--
516+
517The effect of this is best shown by way of comparing to
4528aa1a 518`--full-history` with parent rewriting. The example turns into:
d266a988
TR
519+
520-----------------------------------------------------------------------
521 .-A---M---N---O
522 / / /
523 I B D
524 \ / /
525 `---------'
526-----------------------------------------------------------------------
527+
19d6eb41 528Note the major differences in `N`, `P`, and `Q` over `--full-history`:
d266a988
TR
529+
530--
531* `N`'s parent list had `I` removed, because it is an ancestor of the
532 other parent `M`. Still, `N` remained because it is !TREESAME.
533+
534* `P`'s parent list similarly had `I` removed. `P` was then
535 removed completely, because it had one parent and is TREESAME.
143f1eaf
KB
536+
537* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
538 was a TREESAME root. `Q` was then removed completely, because it had one
539 parent and is TREESAME.
d266a988 540--
fdcf39e5 541
8d049e18 542There is another simplification mode available:
57456ef4
JH
543
544--ancestry-path::
57456ef4 545 Limit the displayed commits to those directly on the ancestry
4528aa1a
JSJ
546 chain between the ``from'' and ``to'' commits in the given commit
547 range. I.e. only display commits that are ancestor of the ``to''
19d6eb41 548 commit and descendants of the ``from'' commit.
57456ef4
JH
549+
550As an example use case, consider the following commit history:
551+
552-----------------------------------------------------------------------
553 D---E-------F
554 / \ \
555 B---C---G---H---I---J
556 / \
557 A-------K---------------L--M
558-----------------------------------------------------------------------
559+
560A regular 'D..M' computes the set of commits that are ancestors of `M`,
561but excludes the ones that are ancestors of `D`. This is useful to see
562what happened to the history leading to `M` since `D`, in the sense
4528aa1a 563that ``what does `M` have that did not exist in `D`''. The result in this
57456ef4
JH
564example would be all the commits, except `A` and `B` (and `D` itself,
565of course).
566+
567When we want to find out what commits in `M` are contaminated with the
568bug introduced by `D` and need fixing, however, we might want to view
569only the subset of 'D..M' that are actually descendants of `D`, i.e.
4528aa1a 570excluding `C` and `K`. This is exactly what the `--ancestry-path`
57456ef4
JH
571option does. Applied to the 'D..M' range, it results in:
572+
573-----------------------------------------------------------------------
574 E-------F
575 \ \
576 G---H---I---J
577 \
578 L--M
579-----------------------------------------------------------------------
580
8d049e18
DS
581Before discussing another option, `--show-pulls`, we need to
582create a new example history.
32f7037a 583
8d049e18
DS
584A common problem users face when looking at simplified history is that a
585commit they know changed a file somehow does not appear in the file's
586simplified history. Let's demonstrate a new example and show how options
587such as `--full-history` and `--simplify-merges` works in that case:
32f7037a 588
8d049e18
DS
589-----------------------------------------------------------------------
590 .-A---M-----C--N---O---P
591 / / \ \ \/ / /
592 I B \ R-'`-Z' /
593 \ / \/ /
594 \ / /\ /
595 `---X--' `---Y--'
596-----------------------------------------------------------------------
32f7037a 597
8d049e18
DS
598For this example, suppose `I` created `file.txt` which was modified by
599`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`,
600and `Y` do not change `file.txt`. The merge commit `M` was created by
601resolving the merge conflict to include both changes from `A` and `B`
602and hence is not TREESAME to either. The merge commit `R`, however, was
603created by ignoring the contents of `file.txt` at `M` and taking only
604the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not
605`M`. Finally, the natural merge resolution to create `N` is to take the
606contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.
607The merge commits `O` and `P` are TREESAME to their first parents, but
608not to their second parents, `Z` and `Y` respectively.
32f7037a 609
8d049e18
DS
610When using the default mode, `N` and `R` both have a TREESAME parent, so
611those edges are walked and the others are ignored. The resulting history
612graph is:
32f7037a 613
8d049e18
DS
614-----------------------------------------------------------------------
615 I---X
616-----------------------------------------------------------------------
32f7037a 617
8d049e18
DS
618When using `--full-history`, Git walks every edge. This will discover
619the commits `A` and `B` and the merge `M`, but also will reveal the
620merge commits `O` and `P`. With parent rewriting, the resulting graph is:
32f7037a 621
8d049e18
DS
622-----------------------------------------------------------------------
623 .-A---M--------N---O---P
624 / / \ \ \/ / /
625 I B \ R-'`--' /
626 \ / \/ /
627 \ / /\ /
628 `---X--' `------'
629-----------------------------------------------------------------------
32f7037a 630
8d049e18
DS
631Here, the merge commits `O` and `P` contribute extra noise, as they did
632not actually contribute a change to `file.txt`. They only merged a topic
633that was based on an older version of `file.txt`. This is a common
634issue in repositories using a workflow where many contributors work in
635parallel and merge their topic branches along a single trunk: manu
636unrelated merges appear in the `--full-history` results.
32f7037a 637
8d049e18
DS
638When using the `--simplify-merges` option, the commits `O` and `P`
639disappear from the results. This is because the rewritten second parents
640of `O` and `P` are reachable from their first parents. Those edges are
641removed and then the commits look like single-parent commits that are
642TREESAME to their parent. This also happens to the commit `N`, resulting
643in a history view as follows:
32f7037a 644
8d049e18
DS
645-----------------------------------------------------------------------
646 .-A---M--.
647 / / \
648 I B R
649 \ / /
650 \ / /
651 `---X--'
652-----------------------------------------------------------------------
32f7037a 653
8d049e18
DS
654In this view, we see all of the important single-parent changes from
655`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the
656not-so-carefully-resolved merge `R`. This is usually enough information
657to determine why the commits `A` and `B` "disappeared" from history in
658the default view. However, there are a few issues with this approach.
32f7037a 659
8d049e18
DS
660The first issue is performance. Unlike any previous option, the
661`--simplify-merges` option requires walking the entire commit history
662before returning a single result. This can make the option difficult to
663use for very large repositories.
32f7037a 664
8d049e18
DS
665The second issue is one of auditing. When many contributors are working
666on the same repository, it is important which merge commits introduced
667a change into an important branch. The problematic merge `R` above is
668not likely to be the merge commit that was used to merge into an
669important branch. Instead, the merge `N` was used to merge `R` and `X`
670into the important branch. This commit may have information about why
671the change `X` came to override the changes from `A` and `B` in its
672commit message.
32f7037a
673
674--show-pulls::
675 In addition to the commits shown in the default history, show
676 each merge commit that is not TREESAME to its first parent but
677 is TREESAME to a later parent.
8d049e18 678+
32f7037a 679When a merge commit is included by `--show-pulls`, the merge is
8d049e18
DS
680treated as if it "pulled" the change from another branch. When using
681`--show-pulls` on this example (and no other options) the resulting
682graph is:
683+
684-----------------------------------------------------------------------
685 I---X---R---N
686-----------------------------------------------------------------------
687+
688Here, the merge commits `R` and `N` are included because they pulled
689the commits `X` and `R` into the base branch, respectively. These
690merges are the reason the commits `A` and `B` do not appear in the
691default history.
692+
693When `--show-pulls` is paired with `--simplify-merges`, the
694graph includes all of the necessary information:
695+
696-----------------------------------------------------------------------
697 .-A---M--. N
698 / / \ /
699 I B R
700 \ / /
701 \ / /
702 `---X--'
703-----------------------------------------------------------------------
704+
705Notice that since `M` is reachable from `R`, the edge from `N` to `M`
706was simplified away. However, `N` still appears in the history as an
707important commit because it "pulled" the change `R` into the main
708branch.
709
4528aa1a 710The `--simplify-by-decoration` option allows you to view only the
3fcfd662
NS
711big picture of the topology of the history, by omitting commits
712that are not referenced by tags. Commits are marked as !TREESAME
713(in other words, kept after history simplification rules described
714above) if (1) they are referenced by tags, or (2) they change the
715contents of the paths given on the command line. All other
716commits are marked as TREESAME (subject to be simplified away).
717
461caf3e 718ifndef::git-shortlog[]
fdcf39e5 719ifdef::git-rev-list[]
70d9895e
TR
720Bisection Helpers
721~~~~~~~~~~~~~~~~~
722
fdcf39e5 723--bisect::
4528aa1a
JSJ
724 Limit output to the one commit object which is roughly halfway between
725 included and excluded commits. Note that the bad bisection ref
726 `refs/bisect/bad` is added to the included commits (if it
727 exists) and the good bisection refs `refs/bisect/good-*` are
728 added to the excluded commits (if they exist). Thus, supposing there
729 are no refs in `refs/bisect/`, if
730+
fdcf39e5 731-----------------------------------------------------------------------
6514aa36 732 $ git rev-list --bisect foo ^bar ^baz
fdcf39e5 733-----------------------------------------------------------------------
4528aa1a 734+
fdcf39e5 735outputs 'midpoint', the output of the two commands
4528aa1a 736+
fdcf39e5 737-----------------------------------------------------------------------
6514aa36
CC
738 $ git rev-list foo ^midpoint
739 $ git rev-list midpoint ^bar ^baz
fdcf39e5 740-----------------------------------------------------------------------
4528aa1a 741+
fdcf39e5
MV
742would be of roughly the same length. Finding the change which
743introduces a regression is thus reduced to a binary search: repeatedly
744generate and test new 'midpoint's until the commit chain is of length
0fe305a5 745one.
fdcf39e5
MV
746
747--bisect-vars::
4528aa1a
JSJ
748 This calculates the same as `--bisect`, except that refs in
749 `refs/bisect/` are not used, and except that this outputs
750 text ready to be eval'ed by the shell. These lines will assign the
751 name of the midpoint revision to the variable `bisect_rev`, and the
752 expected number of commits to be tested after `bisect_rev` is tested
753 to `bisect_nr`, the expected number of commits to be tested if
754 `bisect_rev` turns out to be good to `bisect_good`, the expected
755 number of commits to be tested if `bisect_rev` turns out to be bad to
756 `bisect_bad`, and the number of commits we are bisecting right now to
757 `bisect_all`.
fdcf39e5
MV
758
759--bisect-all::
4528aa1a
JSJ
760 This outputs all the commit objects between the included and excluded
761 commits, ordered by their distance to the included and excluded
762 commits. Refs in `refs/bisect/` are not used. The farthest
763 from them is displayed first. (This is the only one displayed by
764 `--bisect`.)
3d2d4f96 765+
fdcf39e5
MV
766This is useful because it makes it easy to choose a good commit to
767test when you want to avoid to test some of them for some reason (they
768may not compile for example).
3d2d4f96 769+
fdcf39e5
MV
770This option can be used along with `--bisect-vars`, in this case,
771after all the sorted commit objects, there will be the same text as if
772`--bisect-vars` had been used alone.
773endif::git-rev-list[]
461caf3e 774endif::git-shortlog[]
fdcf39e5 775
461caf3e 776ifndef::git-shortlog[]
fdcf39e5
MV
777Commit Ordering
778~~~~~~~~~~~~~~~
779
780By default, the commits are shown in reverse chronological order.
781
3f0350cc
JH
782--date-order::
783 Show no parents before all of its children are shown, but
784 otherwise show commits in the commit timestamp order.
fdcf39e5 785
81c6b38b
JH
786--author-date-order::
787 Show no parents before all of its children are shown, but
788 otherwise show commits in the author timestamp order.
789
3f0350cc
JH
790--topo-order::
791 Show no parents before all of its children are shown, and
792 avoid showing commits on multiple lines of history
793 intermixed.
794+
795For example, in a commit history like this:
796+
797----------------------------------------------------------------
fdcf39e5 798
3f0350cc
JH
799 ---1----2----4----7
800 \ \
801 3----5----6----8---
fdcf39e5 802
3f0350cc
JH
803----------------------------------------------------------------
804+
805where the numbers denote the order of commit timestamps, `git
806rev-list` and friends with `--date-order` show the commits in the
807timestamp order: 8 7 6 5 4 3 2 1.
808+
809With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
8103 1); some older commits are shown before newer ones in order to
811avoid showing the commits from two parallel development track mixed
812together.
fdcf39e5
MV
813
814--reverse::
04be6947
PB
815 Output the commits chosen to be shown (see Commit Limiting
816 section above) in reverse order. Cannot be combined with
817 `--walk-reflogs`.
461caf3e 818endif::git-shortlog[]
fdcf39e5 819
461caf3e 820ifndef::git-shortlog[]
fdcf39e5
MV
821Object Traversal
822~~~~~~~~~~~~~~~~
823
2de9b711 824These options are mostly targeted for packing of Git repositories.
fdcf39e5 825
3cab02de 826ifdef::git-rev-list[]
fdcf39e5 827--objects::
fdcf39e5 828 Print the object IDs of any object referenced by the listed
4528aa1a 829 commits. `--objects foo ^bar` thus means ``send me
fdcf39e5 830 all object IDs which I need to download if I have the commit
4528aa1a 831 object _bar_ but not _foo_''.
fdcf39e5 832
ce5b6f9b
SB
833--in-commit-order::
834 Print tree and blob ids in order of the commits. The tree
835 and blob ids are printed after they are first referenced
836 by a commit.
837
fdcf39e5 838--objects-edge::
4528aa1a
JSJ
839 Similar to `--objects`, but also print the IDs of excluded
840 commits prefixed with a ``-'' character. This is used by
8297643f 841 linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
fdcf39e5
MV
842 objects in deltified form based on objects contained in these
843 excluded commits to reduce network traffic.
844
1684c1b2 845--objects-edge-aggressive::
846 Similar to `--objects-edge`, but it tries harder to find excluded
2dacf26d 847 commits at the cost of increased time. This is used instead of
848 `--objects-edge` to build ``thin'' packs for shallow repositories.
1684c1b2 849
3cab02de
JH
850--indexed-objects::
851 Pretend as if all trees and blobs used by the index are listed
852 on the command line. Note that you probably want to use
853 `--objects`, too.
854
fdcf39e5 855--unpacked::
4528aa1a 856 Only useful with `--objects`; print the object IDs that are not
fdcf39e5 857 in packs.
caf3827e 858
42357b4e
ES
859--object-names::
860 Only useful with `--objects`; print the names of the object IDs
861 that are found. This is the default behavior.
862
863--no-object-names::
864 Only useful with `--objects`; does not print the names of the object
865 IDs that are found. This inverts `--object-names`. This flag allows
866 the output to be more easily parsed by commands such as
867 linkgit:git-cat-file[1].
868
caf3827e
JH
869--filter=<filter-spec>::
870 Only useful with one of the `--objects*`; omits objects (usually
871 blobs) from the list of printed objects. The '<filter-spec>'
872 may be one of the following:
873+
874The form '--filter=blob:none' omits all blobs.
875+
876The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes
f4371a88
JH
877or units. n may be zero. The suffixes k, m, and g can be used to name
878units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same
879as 'blob:limit=1024'.
caf3827e 880+
f4371a88
JH
881The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
882specification contained in the blob (or blob-expression) '<blob-ish>'
883to omit blobs that would not be not required for a sparse checkout on
884the requested refs.
caf3827e 885+
bc5975d2
MD
886The form '--filter=tree:<depth>' omits all blobs and trees whose depth
887from the root tree is >= <depth> (minimum depth if an object is located
c813a7c3
MD
888at multiple depths in the commits traversed). <depth>=0 will not include
889any trees or blobs unless included explicitly in the command-line (or
890standard input when --stdin is used). <depth>=1 will include only the
891tree and blobs which are referenced directly by a commit reachable from
892<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
893while also including trees and blobs one more level removed from an
894explicitly-given commit or tree.
e693237e
CC
895+
896Note that the form '--filter=sparse:path=<path>' that wants to read
897from an arbitrary path on the filesystem has been dropped for security
898reasons.
489fc9ee
MD
899+
900Multiple '--filter=' flags can be specified to combine filters. Only
901objects which are accepted by every filter are included.
902+
903The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
904used to combined several filters, but this is harder than just repeating
905the '--filter' flag and is usually not necessary. Filters are joined by
906'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
907Besides the '{plus}' and '%' characters, the following characters are
908reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+&#39;&#96;+
909as well as all characters with ASCII code &lt;= `0x20`, which includes
910space and newline.
911+
912Other arbitrary characters can also be encoded. For instance,
913'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
914equivalent.
caf3827e 915
f4371a88
JH
916--no-filter::
917 Turn off any previous `--filter=` argument.
918
caf3827e
JH
919--filter-print-omitted::
920 Only useful with `--filter=`; prints a list of the objects omitted
8d75a1d1 921 by the filter. Object IDs are prefixed with a ``~'' character.
caf3827e
JH
922
923--missing=<missing-action>::
924 A debug option to help with future "partial clone" development.
925 This option specifies how missing objects are handled.
926+
927The form '--missing=error' requests that rev-list stop with an error if
928a missing object is encountered. This is the default action.
929+
930The form '--missing=allow-any' will allow object traversal to continue
931if a missing object is encountered. Missing objects will silently be
932omitted from the results.
933+
df11e196
JT
934The form '--missing=allow-promisor' is like 'allow-any', but will only
935allow object traversal to continue for EXPECTED promisor missing objects.
936Unexpected missing objects will raise an error.
937+
caf3827e
JH
938The form '--missing=print' is like 'allow-any', but will also print a
939list of the missing objects. Object IDs are prefixed with a ``?'' character.
fdcf39e5 940
df11e196
JT
941--exclude-promisor-objects::
942 (For internal use only.) Prefilter object traversal at
943 promisor boundary. This is used with partial clone. This is
944 stronger than `--missing=allow-promisor` because it limits the
945 traversal, rather than just silencing errors about missing
946 objects.
368a8912 947endif::git-rev-list[]
df11e196 948
ca92e59e 949--no-walk[=(sorted|unsorted)]::
ca92e59e
MZ
950 Only show the given commits, but do not traverse their ancestors.
951 This has no effect if a range is specified. If the argument
19d6eb41 952 `unsorted` is given, the commits are shown in the order they were
4528aa1a 953 given on the command line. Otherwise (if `sorted` or no argument
19d6eb41 954 was given), the commits are shown in reverse chronological order
ca92e59e 955 by commit time.
695985f4 956 Cannot be combined with `--graph`.
fdcf39e5
MV
957
958--do-walk::
4528aa1a 959 Overrides a previous `--no-walk`.
461caf3e 960endif::git-shortlog[]
f98fd436 961
461caf3e 962ifndef::git-shortlog[]
f98fd436
MG
963Commit Formatting
964~~~~~~~~~~~~~~~~~
965
966ifdef::git-rev-list[]
967Using these options, linkgit:git-rev-list[1] will act similar to the
968more specialized family of commit log tools: linkgit:git-log[1],
969linkgit:git-show[1], and linkgit:git-whatchanged[1]
970endif::git-rev-list[]
971
972include::pretty-options.txt[]
973
974--relative-date::
f98fd436
MG
975 Synonym for `--date=relative`.
976
4b1c5e1d 977--date=<format>::
f98fd436 978 Only takes effect for dates shown in human-readable format, such
4528aa1a 979 as when using `--pretty`. `log.date` config variable sets a default
add00ba2
JK
980 value for the log command's `--date` option. By default, dates
981 are shown in the original time zone (either committer's or
982 author's). If `-local` is appended to the format (e.g.,
983 `iso-local`), the user's local time zone is used instead.
f98fd436 984+
39a869b2 985--
f98fd436 986`--date=relative` shows dates relative to the current time,
1a2a1e8e
JK
987e.g. ``2 hours ago''. The `-local` option has no effect for
988`--date=relative`.
39a869b2 989
add00ba2 990`--date=local` is an alias for `--date=default-local`.
39a869b2 991
466fb674
BB
992`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
993The differences to the strict ISO 8601 format are:
994
995 - a space instead of the `T` date/time delimiter
996 - a space between time and time zone
997 - no colon between hours and minutes of the time zone
998
466fb674
BB
999`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
1000ISO 8601 format.
39a869b2 1001
f98fd436 1002`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
19d6eb41 1003format, often found in email messages.
39a869b2 1004
19d6eb41 1005`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
39a869b2 1006
442f6fd3
JH
1007`--date=raw` shows the date as seconds since the epoch (1970-01-01
100800:00:00 UTC), followed by a space, and then the timezone as an offset
1009from UTC (a `+` or `-` with four digits; the first two are hours, and
1010the second two are minutes). I.e., as if the timestamp were formatted
1011with `strftime("%s %z")`).
1a2a1e8e
JK
1012Note that the `-local` option does not affect the seconds-since-epoch
1013value (which is always measured in UTC), but does switch the accompanying
1014timezone value.
39a869b2 1015
038a8788
SS
1016`--date=human` shows the timezone if the timezone does not match the
1017current time-zone, and doesn't print the whole date if that matches
1018(ie skip printing year for dates that are "this year", but also skip
1019the whole date itself if it's in the last few days and we can just say
1020what weekday it was). For older dates the hour and minute is also
1021omitted.
39a869b2 1022
642833db
JK
1023`--date=unix` shows the date as a Unix epoch timestamp (seconds since
10241970). As with `--raw`, this is always in UTC and therefore `-local`
1025has no effect.
39a869b2 1026
c3fbf81a
RS
1027`--date=format:...` feeds the format `...` to your system `strftime`,
1028except for %z and %Z, which are handled internally.
aa1462cc
JK
1029Use `--date=format:%c` to show the date in your system locale's
1030preferred format. See the `strftime` manual for a complete list of
add00ba2
JK
1031format placeholders. When using `-local`, the correct syntax is
1032`--date=format-local:...`.
39a869b2 1033
add00ba2
JK
1034`--date=default` is the default format, and is similar to
1035`--date=rfc2822`, with a few exceptions:
39a869b2 1036--
add00ba2
JK
1037 - there is no comma after the day-of-week
1038
1039 - the time zone is omitted when the local time zone is used
f98fd436
MG
1040
1041ifdef::git-rev-list[]
1042--header::
f98fd436
MG
1043 Print the contents of the commit in raw-format; each record is
1044 separated with a NUL character.
1045endif::git-rev-list[]
1046
1047--parents::
f98fd436 1048 Print also the parents of the commit (in the form "commit parent...").
4f851dc8 1049 Also enables parent rewriting, see 'History Simplification' above.
f98fd436
MG
1050
1051--children::
f98fd436 1052 Print also the children of the commit (in the form "commit child...").
4f851dc8 1053 Also enables parent rewriting, see 'History Simplification' above.
f98fd436
MG
1054
1055ifdef::git-rev-list[]
1056--timestamp::
1057 Print the raw commit timestamp.
1058endif::git-rev-list[]
1059
1060--left-right::
27ac8371 1061 Mark which side of a symmetric difference a commit is reachable from.
f98fd436
MG
1062 Commits from the left side are prefixed with `<` and those from
1063 the right with `>`. If combined with `--boundary`, those
1064 commits are prefixed with `-`.
1065+
1066For example, if you have this topology:
1067+
1068-----------------------------------------------------------------------
1069 y---b---b branch B
1070 / \ /
1071 / .
1072 / / \
1073 o---x---a---a branch A
1074-----------------------------------------------------------------------
1075+
1076you would get an output like this:
1077+
1078-----------------------------------------------------------------------
1079 $ git rev-list --left-right --boundary --pretty=oneline A...B
1080
1081 >bbbbbbb... 3rd on b
1082 >bbbbbbb... 2nd on b
1083 <aaaaaaa... 3rd on a
1084 <aaaaaaa... 2nd on a
1085 -yyyyyyy... 1st on b
1086 -xxxxxxx... 1st on a
1087-----------------------------------------------------------------------
1088
1089--graph::
f98fd436
MG
1090 Draw a text-based graphical representation of the commit history
1091 on the left hand side of the output. This may cause extra lines
1092 to be printed in between commits, in order for the graph history
1093 to be drawn properly.
695985f4 1094 Cannot be combined with `--no-walk`.
f98fd436 1095+
4f851dc8 1096This enables parent rewriting, see 'History Simplification' above.
f98fd436 1097+
4528aa1a
JSJ
1098This implies the `--topo-order` option by default, but the
1099`--date-order` option may also be specified.
f98fd436 1100
1b32dece
NTND
1101--show-linear-break[=<barrier>]::
1102 When --graph is not used, all history branches are flattened
1103 which can make it hard to see that the two consecutive commits
1104 do not belong to a linear branch. This option puts a barrier
1105 in between them in that case. If `<barrier>` is specified, it
1106 is the string that will be shown instead of the default one.
1107
f98fd436
MG
1108ifdef::git-rev-list[]
1109--count::
1110 Print a number stating how many commits would have been
1111 listed, and suppress all other output. When used together
4528aa1a 1112 with `--left-right`, instead print the counts for left and
b388e14b 1113 right commits, separated by a tab. When used together with
4528aa1a 1114 `--cherry-mark`, omit patch equivalent commits from these
b388e14b
MG
1115 counts and print the count for equivalent commits separated
1116 by a tab.
f98fd436 1117endif::git-rev-list[]
461caf3e 1118endif::git-shortlog[]