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