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