blob: 002379056a072cb87f7c65bbcaedaa4ebed7387a [file] [log] [blame]
Junio C Hamanob0e02952008-01-19 08:02:001Commit Limiting
2~~~~~~~~~~~~~~~
3
4Besides specifying a range of commits that should be listed using the
5special notations explained in the description, additional commit
Junio C Hamano8ce35d72012-09-18 22:30:426limiting 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`.
Junio C Hamanob0e02952008-01-19 08:02:0015
Junio C Hamano693e7092012-09-12 22:56:5316-<number>::
17-n <number>::
Junio C Hamanob4a9ede2009-04-08 07:36:3218--max-count=<number>::
Junio C Hamanoc5be4cc2011-03-09 07:20:4319Limit the number of commits to output.
Junio C Hamanob0e02952008-01-19 08:02:0020
Junio C Hamanob4a9ede2009-04-08 07:36:3221--skip=<number>::
Junio C Hamanob0e02952008-01-19 08:02:0022Skip 'number' commits before starting to show the commit output.
23
Junio C Hamanob4a9ede2009-04-08 07:36:3224--since=<date>::
25--after=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0026Show commits more recent than a specific date.
27
Junio C Hamanob4a9ede2009-04-08 07:36:3228--until=<date>::
29--before=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0030Show commits older than a specific date.
31
Junio C Hamano4f1d8c42008-03-03 02:01:1632ifdef::git-rev-list[]
Junio C Hamanob4a9ede2009-04-08 07:36:3233--max-age=<timestamp>::
34--min-age=<timestamp>::
Junio C Hamanob0e02952008-01-19 08:02:0035Limit the commits output to specified time range.
Junio C Hamano4f1d8c42008-03-03 02:01:1636endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0037
Junio C Hamanob4a9ede2009-04-08 07:36:3238--author=<pattern>::
39--committer=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0040Limit the commits output to ones with author/committer
Junio C Hamano8ce35d72012-09-18 22:30:4241header lines that match the specified pattern (regular
42expression). With more than one `--author=<pattern>`,
43commits whose author matches any of the given patterns are
44chosen (similarly for multiple `--committer=<pattern>`).
Junio C Hamanob0e02952008-01-19 08:02:0045
Junio C Hamano9954ed72012-10-03 04:54:0046--grep-reflog=<pattern>::
Junio C Hamano9954ed72012-10-03 04:54:0047Limit the commits output to ones with reflog entries that
48match the specified pattern (regular expression). With
49more than one `--grep-reflog`, commits whose reflog message
50matches any of the given patterns are chosen. It is an
51error to use this option unless `--walk-reflogs` is in use.
52
Junio C Hamanob4a9ede2009-04-08 07:36:3253--grep=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0054Limit the commits output to ones with log message that
Junio C Hamano8ce35d72012-09-18 22:30:4255matches the specified pattern (regular expression). With
56more than one `--grep=<pattern>`, commits whose message
57matches any of the given patterns are chosen (but see
58`--all-match`).
Junio C Hamano3891e252015-08-31 23:06:1359ifndef::git-rev-list[]
Junio C Hamano9954ed72012-10-03 04:54:0060+
Junio C Hamanob3f862c2019-12-05 22:22:0061When `--notes` is in effect, the message from the notes is
Junio C Hamano8152abf2015-04-28 22:48:0262matched as if it were part of the log message.
Junio C Hamano3891e252015-08-31 23:06:1363endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0064
Junio C Hamanoaa17c7c2008-11-03 04:36:5865--all-match::
Junio C Hamanob73af6c2013-12-03 22:07:1166Limit the commits output to ones that match all given `--grep`,
Junio C Hamano8ce35d72012-09-18 22:30:4267instead of ones that match at least one.
Junio C Hamanoaa17c7c2008-11-03 04:36:5868
Junio C Hamano6bb32e62015-02-17 22:11:2669--invert-grep::
70Limit the commits output to ones with log message that do not
71match the pattern specified with `--grep=<pattern>`.
72
Junio C Hamanoeb415992008-06-08 22:49:4773-i::
74--regexp-ignore-case::
Junio C Hamanob73af6c2013-12-03 22:07:1175Match the regular expression limiting patterns without regard to letter
76case.
Junio C Hamanob0e02952008-01-19 08:02:0077
Junio C Hamanoa1295452012-11-13 22:32:0478--basic-regexp::
Junio C Hamanoa1295452012-11-13 22:32:0479Consider the limiting patterns to be basic regular expressions;
80this is the default.
81
Junio C Hamanoeb415992008-06-08 22:49:4782-E::
83--extended-regexp::
Junio C Hamanob0e02952008-01-19 08:02:0084Consider the limiting patterns to be extended regular expressions
85instead of the default basic regular expressions.
86
Junio C Hamanoeb415992008-06-08 22:49:4787-F::
88--fixed-strings::
Junio C Hamano24bc09a2008-02-28 00:27:4489Consider the limiting patterns to be fixed strings (don't interpret
90pattern as a regular expression).
91
Junio C Hamanoa275c1f2017-06-19 20:10:1292-P::
Junio C Hamanoa1295452012-11-13 22:32:0493--perl-regexp::
Junio C Hamano222ed822017-06-02 06:24:0694Consider the limiting patterns to be Perl-compatible regular
95expressions.
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.
Junio C Hamanoa1295452012-11-13 22:32:04100
Junio C Hamanob0e02952008-01-19 08:02:00101--remove-empty::
Junio C Hamanob0e02952008-01-19 08:02:00102Stop when a given path disappears from the tree.
103
Junio C Hamano934e1782009-07-16 06:59:15104--merges::
Junio C Hamanof32ce262011-03-27 07:35:11105Print only merge commits. This is exactly the same as `--min-parents=2`.
Junio C Hamano934e1782009-07-16 06:59:15106
Junio C Hamanob0e02952008-01-19 08:02:00107--no-merges::
Junio C Hamanof32ce262011-03-27 07:35:11108Do not print commits with more than one parent. This is
109exactly the same as `--max-parents=1`.
110
111--min-parents=<number>::
112--max-parents=<number>::
113--no-min-parents::
114--no-max-parents::
Junio C Hamanoc5bb3b32013-08-05 22:43:36115Show only commits which have at least (or at most) that many parent
Junio C Hamanof32ce262011-03-27 07:35:11116commits. In particular, `--max-parents=1` is the same as `--no-merges`,
117`--min-parents=2` is the same as `--merges`. `--max-parents=0`
118gives 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).
Junio C Hamanob0e02952008-01-19 08:02:00123
124--first-parent::
125Follow only the first parent commit upon seeing a merge
126commit. This option can give a better overview when
127viewing the evolution of a particular topic branch,
128because merges into a topic branch tend to be only about
129adjusting to updated upstream from time to time, and
130this option allows you to ignore the individual commits
Junio C Hamano255163d2020-08-18 00:37:23131brought in to your history by such a merge.
Junio C Hamanob0e02952008-01-19 08:02:00132
133--not::
Junio C Hamanob0e02952008-01-19 08:02:00134Reverses the meaning of the '{caret}' prefix (or lack thereof)
Junio C Hamanob73af6c2013-12-03 22:07:11135for all following revision specifiers, up to the next `--not`.
Junio C Hamanob0e02952008-01-19 08:02:00136
137--all::
Junio C Hamanoe89102f2017-02-15 23:18:15138Pretend as if all the refs in `refs/`, along with `HEAD`, are
139listed on the command line as '<commit>'.
Junio C Hamanob0e02952008-01-19 08:02:00140
Junio C Hamanod2179ef2010-10-22 04:12:17141--branches[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14142Pretend as if all the refs in `refs/heads` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17143on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano57827fb2010-01-23 03:02:50144branches to ones matching given shell glob. If pattern lacks '?',
Junio C Hamano81d540a2012-03-02 19:52:47145'{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56146
Junio C Hamanod2179ef2010-10-22 04:12:17147--tags[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14148Pretend as if all the refs in `refs/tags` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17149on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano81d540a2012-03-02 19:52:47150tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
151or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56152
Junio C Hamanod2179ef2010-10-22 04:12:17153--remotes[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14154Pretend as if all the refs in `refs/remotes` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17155on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano97bcb482010-11-25 03:16:07156remote-tracking branches to ones matching given shell glob.
Junio C Hamano81d540a2012-03-02 19:52:47157If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50158
Junio C Hamanod2179ef2010-10-22 04:12:17159--glob=<glob-pattern>::
160Pretend as if all the refs matching shell glob '<glob-pattern>'
Junio C Hamano57827fb2010-01-23 03:02:50161are listed on the command line as '<commit>'. Leading 'refs/',
Junio C Hamano81d540a2012-03-02 19:52:47162is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
163or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50164
Junio C Hamanof079f702013-12-06 23:43:18165--exclude=<glob-pattern>::
166
167Do not include refs matching '<glob-pattern>' that the next `--all`,
168`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
169consider. Repetitions of this option accumulate exclusion patterns
170up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
171`--glob` option (other options or arguments do not clear
Junio C Hamanofb5ffde2014-11-04 22:38:56172accumulated patterns).
Junio C Hamanof079f702013-12-06 23:43:18173+
174The patterns given should not begin with `refs/heads`, `refs/tags`, or
175`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
176respectively, and they must begin with `refs/` when applied to `--glob`
177or `--all`. If a trailing '/{asterisk}' is intended, it must be given
178explicitly.
179
Junio C Hamano2a4bcbc2014-10-29 20:07:39180--reflog::
181Pretend as if all objects mentioned by reflogs are listed on the
182command line as `<commit>`.
183
Junio C Hamanoa42e0332019-07-19 19:49:37184--alternate-refs::
185Pretend as if all objects mentioned as ref tips of alternate
186repositories were listed on the command line. An alternate
187repository is any repository whose object directory is specified
188in `objects/info/alternates`. The set of included objects may
189be modified by `core.alternateRefsCommand`, etc. See
190linkgit:git-config[1].
191
Junio C Hamano8d57fa92017-09-19 05:01:08192--single-worktree::
193By default, all working trees will be examined by the
194following options when there are more than one (see
195linkgit:git-worktree[1]): `--all`, `--reflog` and
196`--indexed-objects`.
197This option forces them to examine the current working tree
198only.
199
Junio C Hamano084228c2011-05-30 08:13:52200--ignore-missing::
Junio C Hamano084228c2011-05-30 08:13:52201Upon seeing an invalid object name in the input, pretend as if
202the bad input was not given.
Junio C Hamano50819852008-11-19 02:07:56203
Junio C Hamano5706e0b2009-11-24 10:54:16204ifndef::git-rev-list[]
205--bisect::
Junio C Hamano4fdccb22010-02-19 09:58:14206Pretend as if the bad bisection ref `refs/bisect/bad`
Junio C Hamano5706e0b2009-11-24 10:54:16207was listed and as if it was followed by `--not` and the good
Junio C Hamano4fdccb22010-02-19 09:58:14208bisection refs `refs/bisect/good-*` on the command
Junio C Hamano255163d2020-08-18 00:37:23209line.
Junio C Hamano5706e0b2009-11-24 10:54:16210endif::git-rev-list[]
211
Junio C Hamanob0e02952008-01-19 08:02:00212--stdin::
Junio C Hamanob0e02952008-01-19 08:02:00213In addition to the '<commit>' listed on the command
Junio C Hamano92d80372016-07-13 22:00:05214line, read them from the standard input. If a `--` separator is
Junio C Hamano5706e0b2009-11-24 10:54:16215seen, stop reading commits and start reading paths to limit the
216result.
Junio C Hamanob0e02952008-01-19 08:02:00217
Junio C Hamano5706e0b2009-11-24 10:54:16218ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00219--quiet::
Junio C Hamanob0e02952008-01-19 08:02:00220Don't print anything to standard output. This form
221is primarily meant to allow the caller to
222test the exit status to see if a range of objects is fully
223connected (or not). It is faster than redirecting stdout
Junio C Hamanob73af6c2013-12-03 22:07:11224to `/dev/null` as the output does not have to be formatted.
Junio C Hamano69cd7c52008-06-04 07:52:59225endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00226
Junio C Hamano9a2fb2d2011-03-23 05:40:15227--cherry-mark::
Junio C Hamano9a2fb2d2011-03-23 05:40:15228Like `--cherry-pick` (see below) but mark equivalent commits
229with `=` rather than omitting them, and inequivalent ones with `+`.
230
Junio C Hamanob0e02952008-01-19 08:02:00231--cherry-pick::
Junio C Hamanob0e02952008-01-19 08:02:00232Omit any commit that introduces the same change as
Junio C Hamanob73af6c2013-12-03 22:07:11233another commit on the ``other side'' when the set of
Junio C Hamanob0e02952008-01-19 08:02:00234commits are limited with symmetric difference.
235+
236For example, if you have two branches, `A` and `B`, a usual way
237to list all commits on only one side of them is with
Junio C Hamano5cd15182011-04-05 00:21:10238`--left-right` (see the example below in the description of
Junio C Hamanob73af6c2013-12-03 22:07:11239the `--left-right` option). However, it shows the commits that were
240cherry-picked from the other branch (for example, ``3rd on b'' may be
241cherry-picked from branch A). With this option, such pairs of commits are
Junio C Hamanob0e02952008-01-19 08:02:00242excluded from the output.
243
Junio C Hamano9a2fb2d2011-03-23 05:40:15244--left-only::
245--right-only::
Junio C Hamanocd451662016-09-13 00:54:09246List only commits on the respective side of a symmetric difference,
Junio C Hamano9a2fb2d2011-03-23 05:40:15247i.e. only those which would be marked `<` resp. `>` by
248`--left-right`.
249+
250For example, `--cherry-pick --right-only A...B` omits those
251commits from `B` which are in `A` or are patch-equivalent to a commit in
Junio C Hamanob76a6862012-05-02 22:02:46252`A`. In other words, this lists the `+` commits from `git cherry A B`.
Junio C Hamano9a2fb2d2011-03-23 05:40:15253More precisely, `--cherry-pick --right-only --no-merges` gives the exact
254list.
255
256--cherry::
Junio C Hamano9a2fb2d2011-03-23 05:40:15257A synonym for `--right-only --cherry-mark --no-merges`; useful to
258limit the output to the commits on our side and mark those that
259have been applied to the other side of a forked history with
260`git log --cherry upstream...mybranch`, similar to
261`git cherry upstream mybranch`.
262
Junio C Hamanoeb415992008-06-08 22:49:47263-g::
264--walk-reflogs::
Junio C Hamanob0e02952008-01-19 08:02:00265Instead of walking the commit ancestry chain, walk
266reflog entries from the most recent one to older ones.
267When this option is used you cannot specify commits to
268exclude (that is, '{caret}commit', 'commit1..commit2',
Junio C Hamanod75148a2014-04-08 19:48:38269and 'commit1\...commit2' notations cannot be used).
Junio C Hamanob0e02952008-01-19 08:02:00270+
Junio C Hamanob4896852019-12-10 23:15:09271With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
Junio C Hamanob0e02952008-01-19 08:02:00272this causes the output to have two extra lines of information
Junio C Hamanoe548d1b2016-08-08 22:26:49273taken from the reflog. The reflog designator in the output may be shown
274as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
275reflog) or as `ref@{timestamp}` (with the timestamp for that entry),
276depending on a few rules:
277+
278--
2791. If the starting point is specified as `ref@{Nth}`, show the index
Junio C Hamano2567b322019-02-05 23:33:56280 format.
Junio C Hamanoe548d1b2016-08-08 22:26:49281+
2822. If the starting point was specified as `ref@{now}`, show the
Junio C Hamano2567b322019-02-05 23:33:56283 timestamp format.
Junio C Hamanoe548d1b2016-08-08 22:26:49284+
2853. If neither was used, but `--date` was given on the command line, show
Junio C Hamano2567b322019-02-05 23:33:56286 the timestamp in the format requested by `--date`.
Junio C Hamanoe548d1b2016-08-08 22:26:49287+
2884. Otherwise, show the index format.
289--
290+
291Under `--pretty=oneline`, the commit message is
Junio C Hamanob0e02952008-01-19 08:02:00292prefixed with this information on the same line.
Junio C Hamanob73af6c2013-12-03 22:07:11293This option cannot be combined with `--reverse`.
Junio C Hamanob0e02952008-01-19 08:02:00294See also linkgit:git-reflog[1].
Junio C Hamanob4896852019-12-10 23:15:09295+
296Under `--pretty=reference`, this information will not be shown at all.
Junio C Hamanob0e02952008-01-19 08:02:00297
298--merge::
Junio C Hamanob0e02952008-01-19 08:02:00299After a failed merge, show refs that touch files having a
300conflict and don't exist on all heads to merge.
301
302--boundary::
Junio C Hamano27159f82013-06-14 17:19:22303Output excluded boundary commits. Boundary commits are
304prefixed with `-`.
Junio C Hamanob0e02952008-01-19 08:02:00305
Junio C Hamano5b3533d2014-02-27 23:07:15306ifdef::git-rev-list[]
307--use-bitmap-index::
308
309Try to speed up the traversal using the pack bitmap index (if
310one is available). Note that when traversing with `--objects`,
311trees and blobs will not have their associated path printed.
Junio C Hamanoe48a1132016-08-03 22:40:21312
313--progress=<header>::
314Show progress reports on stderr as objects are considered. The
315`<header>` text will be printed with each progress update.
Junio C Hamano5b3533d2014-02-27 23:07:15316endif::git-rev-list[]
317
Junio C Hamanoa76cb0d2008-08-13 20:04:10318History Simplification
319~~~~~~~~~~~~~~~~~~~~~~
320
Junio C Hamano28363492008-11-14 08:26:31321Sometimes you are only interested in parts of the history, for example the
322commits modifying a particular <path>. But there are two parts of
323'History Simplification', one part is selecting the commits and the other
324is how to do it, as there are various strategies to simplify the history.
325
326The following options select the commits to be shown:
327
328<paths>::
Junio C Hamano28363492008-11-14 08:26:31329Commits modifying the given <paths> are selected.
330
331--simplify-by-decoration::
Junio C Hamano28363492008-11-14 08:26:31332Commits that are referred by some branch or tag are selected.
333
334Note that extra commits can be shown to give a meaningful history.
335
336The following options affect the way the simplification is performed:
337
338Default mode::
Junio C Hamano28363492008-11-14 08:26:31339Simplifies the history to the simplest history explaining the
340final state of the tree. Simplest because it prunes some side
341branches if the end result is the same (i.e. merging branches
342with the same content)
343
Junio C Hamano67bf2242020-04-22 21:41:44344--show-pulls::
345Include all commits from the default mode, but also any merge
346commits that are not TREESAME to the first parent but are
347TREESAME to a later parent. This mode is helpful for showing
348the merge commits that "first introduced" a change to a branch.
349
Junio C Hamano28363492008-11-14 08:26:31350--full-history::
Junio C Hamano15567bc2011-07-23 00:51:59351Same as the default mode, but does not prune some history.
Junio C Hamano28363492008-11-14 08:26:31352
353--dense::
Junio C Hamano28363492008-11-14 08:26:31354Only the selected commits are shown, plus some to have a
355meaningful history.
356
357--sparse::
Junio C Hamano28363492008-11-14 08:26:31358All commits in the simplified history are shown.
359
360--simplify-merges::
Junio C Hamanob73af6c2013-12-03 22:07:11361Additional option to `--full-history` to remove some needless
Junio C Hamano28363492008-11-14 08:26:31362merges from the resulting history, as there are no selected
363commits contributing to this merge.
364
Junio C Hamano89a57342010-06-22 23:22:55365--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55366When given a range of commits to display (e.g. 'commit1..commit2'
367or 'commit2 {caret}commit1'), only display commits that exist
368directly on the ancestry chain between the 'commit1' and
369'commit2', i.e. commits that are both descendants of 'commit1',
370and ancestors of 'commit2'.
371
Junio C Hamano28363492008-11-14 08:26:31372A more detailed explanation follows.
Junio C Hamanoa76cb0d2008-08-13 20:04:10373
374Suppose you specified `foo` as the <paths>. We shall call commits
375that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
376filtered for `foo`, they look different and equal, respectively.)
377
378In the following, we will always refer to the same example history to
379illustrate the differences between simplification settings. We assume
380that you are filtering for a file `foo` in this commit graph:
381-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22382 .-A---M---N---O---P---Q
383 / / / / / /
384I B C D E Y
385 \ / / / / /
386 `-------------' X
Junio C Hamanoa76cb0d2008-08-13 20:04:10387-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22388The horizontal line of history A---Q is taken to be the first parent of
Junio C Hamanoa76cb0d2008-08-13 20:04:10389each merge. The commits are:
390
391* `I` is the initial commit, in which `foo` exists with contents
Junio C Hamanob73af6c2013-12-03 22:07:11392 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Junio C Hamanoa76cb0d2008-08-13 20:04:10393 commits are compared to an empty tree, so `I` is !TREESAME.
394
Junio C Hamanob73af6c2013-12-03 22:07:11395* In `A`, `foo` contains just ``foo''.
Junio C Hamanoa76cb0d2008-08-13 20:04:10396
397* `B` contains the same change as `A`. Its merge `M` is trivial and
398 hence TREESAME to all parents.
399
Junio C Hamanob73af6c2013-12-03 22:07:11400* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Junio C Hamanoa76cb0d2008-08-13 20:04:10401 so it is not TREESAME to any parent.
402
Junio C Hamanob73af6c2013-12-03 22:07:11403* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
404 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
Junio C Hamanoa76cb0d2008-08-13 20:04:10405
Junio C Hamanob73af6c2013-12-03 22:07:11406* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
407 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
Junio C Hamano27159f82013-06-14 17:19:22408
Junio C Hamanod7fccbf2013-07-25 03:24:57409* `X` is an independent root commit that added a new file `side`, and `Y`
Junio C Hamano27159f82013-06-14 17:19:22410 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
411 `Q` is TREESAME to `P`, but not to `Y`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10412
Junio C Hamanob73af6c2013-12-03 22:07:11413`rev-list` walks backwards through history, including or excluding
414commits based on whether `--full-history` and/or parent rewriting
415(via `--parents` or `--children`) are used. The following settings
Junio C Hamanoa76cb0d2008-08-13 20:04:10416are available.
417
418Default mode::
Junio C Hamanoa76cb0d2008-08-13 20:04:10419Commits are included if they are not TREESAME to any parent
Junio C Hamanob73af6c2013-12-03 22:07:11420(though this can be changed, see `--sparse` below). If the
Junio C Hamanoa76cb0d2008-08-13 20:04:10421commit was a merge, and it was TREESAME to one parent, follow
422only that parent. (Even if there are several TREESAME
423parents, follow only one of them.) Otherwise, follow all
424parents.
425+
426This results in:
427+
428-----------------------------------------------------------------------
429 .-A---N---O
Junio C Hamano89a57342010-06-22 23:22:55430 / / /
Junio C Hamanoa76cb0d2008-08-13 20:04:10431I---------D
432-----------------------------------------------------------------------
433+
434Note how the rule to only follow the TREESAME parent, if one is
435available, removed `B` from consideration entirely. `C` was
436considered via `N`, but is TREESAME. Root commits are compared to an
437empty tree, so `I` is !TREESAME.
438+
Junio C Hamanob73af6c2013-12-03 22:07:11439Parent/child relations are only visible with `--parents`, but that does
Junio C Hamanoa76cb0d2008-08-13 20:04:10440not affect the commits selected in default mode, so we have shown the
441parent lines.
442
443--full-history without parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10444This mode differs from the default in one point: always follow
445all parents of a merge, even if it is TREESAME to one of them.
446Even if more than one side of the merge has commits that are
447included, this does not imply that the merge itself is! In
448the example, we get
449+
450-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22451I A B N D O P Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10452-----------------------------------------------------------------------
453+
Junio C Hamano27159f82013-06-14 17:19:22454`M` was excluded because it is TREESAME to both parents. `E`,
Junio C Hamanoa76cb0d2008-08-13 20:04:10455`C` and `B` were all walked, but only `B` was !TREESAME, so the others
456do not appear.
457+
458Note that without parent rewriting, it is not really possible to talk
459about the parent/child relationships between the commits, so we show
460them disconnected.
461
462--full-history with parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10463Ordinary commits are only included if they are !TREESAME
Junio C Hamanob73af6c2013-12-03 22:07:11464(though this can be changed, see `--sparse` below).
Junio C Hamanoa76cb0d2008-08-13 20:04:10465+
466Merges are always included. However, their parent list is rewritten:
467Along each parent, prune away commits that are not included
468themselves. This results in
469+
470-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22471 .-A---M---N---O---P---Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10472 / / / / /
473I B / D /
474 \ / / / /
475 `-------------'
476-----------------------------------------------------------------------
477+
Junio C Hamanob73af6c2013-12-03 22:07:11478Compare to `--full-history` without rewriting above. Note that `E`
Junio C Hamanoa76cb0d2008-08-13 20:04:10479was pruned away because it is TREESAME, but the parent list of P was
480rewritten to contain `E`'s parent `I`. The same happened for `C` and
Junio C Hamano27159f82013-06-14 17:19:22481`N`, and `X`, `Y` and `Q`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10482
483In addition to the above settings, you can change whether TREESAME
484affects inclusion:
485
Junio C Hamanoeb415992008-06-08 22:49:47486--dense::
Junio C Hamanoa76cb0d2008-08-13 20:04:10487Commits that are walked are included if they are not TREESAME
488to any parent.
489
Junio C Hamanoeb415992008-06-08 22:49:47490--sparse::
Junio C Hamanoa76cb0d2008-08-13 20:04:10491All commits that are walked are included.
492+
Junio C Hamanob73af6c2013-12-03 22:07:11493Note that without `--full-history`, this still simplifies merges: if
Junio C Hamanoa76cb0d2008-08-13 20:04:10494one of the parents is TREESAME, we follow only that one, so the other
495sides of the merge are never walked.
Junio C Hamanob0e02952008-01-19 08:02:00496
Junio C Hamanoa2f46622008-09-03 05:20:31497--simplify-merges::
Junio C Hamanoa2f46622008-09-03 05:20:31498First, build a history graph in the same way that
Junio C Hamanob73af6c2013-12-03 22:07:11499`--full-history` with parent rewriting does (see above).
Junio C Hamanoa2f46622008-09-03 05:20:31500+
501Then simplify each commit `C` to its replacement `C'` in the final
502history according to the following rules:
503+
504--
505* Set `C'` to `C`.
506+
507* Replace each parent `P` of `C'` with its simplification `P'`. In
Junio C Hamano27159f82013-06-14 17:19:22508 the process, drop parents that are ancestors of other parents or that are
509 root commits TREESAME to an empty tree, and remove duplicates, but take care
510 to never drop all parents that we are TREESAME to.
Junio C Hamanoa2f46622008-09-03 05:20:31511+
512* If after this parent rewriting, `C'` is a root or merge commit (has
513 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
514 Otherwise, it is replaced with its only parent.
515--
516+
517The effect of this is best shown by way of comparing to
Junio C Hamanob73af6c2013-12-03 22:07:11518`--full-history` with parent rewriting. The example turns into:
Junio C Hamanoa2f46622008-09-03 05:20:31519+
520-----------------------------------------------------------------------
521 .-A---M---N---O
522 / / /
523I B D
524 \ / /
525 `---------'
526-----------------------------------------------------------------------
527+
Junio C Hamanob73af6c2013-12-03 22:07:11528Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Junio C Hamanoa2f46622008-09-03 05:20:31529+
530--
531* `N`'s parent list had `I` removed, because it is an ancestor of the
532 other parent `M`. Still, `N` remained because it is !TREESAME.
533+
534* `P`'s parent list similarly had `I` removed. `P` was then
535 removed completely, because it had one parent and is TREESAME.
Junio C Hamano27159f82013-06-14 17:19:22536+
537* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
538 was a TREESAME root. `Q` was then removed completely, because it had one
539 parent and is TREESAME.
Junio C Hamanoa2f46622008-09-03 05:20:31540--
Junio C Hamanob0e02952008-01-19 08:02:00541
Junio C Hamano67bf2242020-04-22 21:41:44542There is another simplification mode available:
Junio C Hamano89a57342010-06-22 23:22:55543
544--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55545Limit the displayed commits to those directly on the ancestry
Junio C Hamanob73af6c2013-12-03 22:07:11546chain between the ``from'' and ``to'' commits in the given commit
547range. I.e. only display commits that are ancestor of the ``to''
548commit and descendants of the ``from'' commit.
Junio C Hamano89a57342010-06-22 23:22:55549+
550As an example use case, consider the following commit history:
551+
552-----------------------------------------------------------------------
553 D---E-------F
554 / \ \
555 B---C---G---H---I---J
556 / \
557A-------K---------------L--M
558-----------------------------------------------------------------------
559+
560A regular 'D..M' computes the set of commits that are ancestors of `M`,
561but excludes the ones that are ancestors of `D`. This is useful to see
562what happened to the history leading to `M` since `D`, in the sense
Junio C Hamanob73af6c2013-12-03 22:07:11563that ``what does `M` have that did not exist in `D`''. The result in this
Junio C Hamano89a57342010-06-22 23:22:55564example would be all the commits, except `A` and `B` (and `D` itself,
565of course).
566+
567When we want to find out what commits in `M` are contaminated with the
568bug introduced by `D` and need fixing, however, we might want to view
569only the subset of 'D..M' that are actually descendants of `D`, i.e.
Junio C Hamanob73af6c2013-12-03 22:07:11570excluding `C` and `K`. This is exactly what the `--ancestry-path`
Junio C Hamano89a57342010-06-22 23:22:55571option does. Applied to the 'D..M' range, it results in:
572+
573-----------------------------------------------------------------------
574E-------F
575 \ \
576 G---H---I---J
577 \
578L--M
579-----------------------------------------------------------------------
580
Junio C Hamano67bf2242020-04-22 21:41:44581Before discussing another option, `--show-pulls`, we need to
582create a new example history.
Junio C Hamano0cb719f2020-05-31 20:04:39583
Junio C Hamano67bf2242020-04-22 21:41:44584A common problem users face when looking at simplified history is that a
585commit they know changed a file somehow does not appear in the file's
586simplified history. Let's demonstrate a new example and show how options
587such as `--full-history` and `--simplify-merges` works in that case:
Junio C Hamano0cb719f2020-05-31 20:04:39588
Junio C Hamano67bf2242020-04-22 21:41:44589-----------------------------------------------------------------------
590 .-A---M-----C--N---O---P
591 / / \ \ \/ / /
592I B \ R-'`-Z' /
593 \ / \/ /
594 \ / /\ /
595 `---X--' `---Y--'
596-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39597
Junio C Hamano67bf2242020-04-22 21:41:44598For this example, suppose `I` created `file.txt` which was modified by
599`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`,
600and `Y` do not change `file.txt`. The merge commit `M` was created by
601resolving the merge conflict to include both changes from `A` and `B`
602and hence is not TREESAME to either. The merge commit `R`, however, was
603created by ignoring the contents of `file.txt` at `M` and taking only
604the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not
605`M`. Finally, the natural merge resolution to create `N` is to take the
606contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.
607The merge commits `O` and `P` are TREESAME to their first parents, but
608not to their second parents, `Z` and `Y` respectively.
Junio C Hamano0cb719f2020-05-31 20:04:39609
Junio C Hamano67bf2242020-04-22 21:41:44610When using the default mode, `N` and `R` both have a TREESAME parent, so
611those edges are walked and the others are ignored. The resulting history
612graph is:
Junio C Hamano0cb719f2020-05-31 20:04:39613
Junio C Hamano67bf2242020-04-22 21:41:44614-----------------------------------------------------------------------
615I---X
616-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39617
Junio C Hamano67bf2242020-04-22 21:41:44618When using `--full-history`, Git walks every edge. This will discover
619the commits `A` and `B` and the merge `M`, but also will reveal the
620merge commits `O` and `P`. With parent rewriting, the resulting graph is:
Junio C Hamano0cb719f2020-05-31 20:04:39621
Junio C Hamano67bf2242020-04-22 21:41:44622-----------------------------------------------------------------------
623 .-A---M--------N---O---P
624 / / \ \ \/ / /
625I B \ R-'`--' /
626 \ / \/ /
627 \ / /\ /
628 `---X--' `------'
629-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39630
Junio C Hamano67bf2242020-04-22 21:41:44631Here, the merge commits `O` and `P` contribute extra noise, as they did
632not actually contribute a change to `file.txt`. They only merged a topic
633that was based on an older version of `file.txt`. This is a common
634issue in repositories using a workflow where many contributors work in
635parallel and merge their topic branches along a single trunk: manu
636unrelated merges appear in the `--full-history` results.
Junio C Hamano0cb719f2020-05-31 20:04:39637
Junio C Hamano67bf2242020-04-22 21:41:44638When using the `--simplify-merges` option, the commits `O` and `P`
639disappear from the results. This is because the rewritten second parents
640of `O` and `P` are reachable from their first parents. Those edges are
641removed and then the commits look like single-parent commits that are
642TREESAME to their parent. This also happens to the commit `N`, resulting
643in a history view as follows:
Junio C Hamano0cb719f2020-05-31 20:04:39644
Junio C Hamano67bf2242020-04-22 21:41:44645-----------------------------------------------------------------------
646 .-A---M--.
647 / / \
648I B R
649 \ / /
650 \ / /
651 `---X--'
652-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39653
Junio C Hamano67bf2242020-04-22 21:41:44654In this view, we see all of the important single-parent changes from
655`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the
656not-so-carefully-resolved merge `R`. This is usually enough information
657to determine why the commits `A` and `B` "disappeared" from history in
658the default view. However, there are a few issues with this approach.
Junio C Hamano0cb719f2020-05-31 20:04:39659
Junio C Hamano67bf2242020-04-22 21:41:44660The first issue is performance. Unlike any previous option, the
661`--simplify-merges` option requires walking the entire commit history
662before returning a single result. This can make the option difficult to
663use for very large repositories.
Junio C Hamano0cb719f2020-05-31 20:04:39664
Junio C Hamano67bf2242020-04-22 21:41:44665The second issue is one of auditing. When many contributors are working
666on the same repository, it is important which merge commits introduced
667a change into an important branch. The problematic merge `R` above is
668not likely to be the merge commit that was used to merge into an
669important branch. Instead, the merge `N` was used to merge `R` and `X`
670into the important branch. This commit may have information about why
671the change `X` came to override the changes from `A` and `B` in its
672commit message.
Junio C Hamano0cb719f2020-05-31 20:04:39673
674--show-pulls::
675In addition to the commits shown in the default history, show
676each merge commit that is not TREESAME to its first parent but
677is TREESAME to a later parent.
Junio C Hamano67bf2242020-04-22 21:41:44678+
Junio C Hamano0cb719f2020-05-31 20:04:39679When a merge commit is included by `--show-pulls`, the merge is
Junio C Hamano67bf2242020-04-22 21:41:44680treated as if it "pulled" the change from another branch. When using
681`--show-pulls` on this example (and no other options) the resulting
682graph is:
683+
684-----------------------------------------------------------------------
685I---X---R---N
686-----------------------------------------------------------------------
687+
688Here, the merge commits `R` and `N` are included because they pulled
689the commits `X` and `R` into the base branch, respectively. These
690merges are the reason the commits `A` and `B` do not appear in the
691default history.
692+
693When `--show-pulls` is paired with `--simplify-merges`, the
694graph includes all of the necessary information:
695+
696-----------------------------------------------------------------------
697 .-A---M--. N
698 / / \ /
699I B R
700 \ / /
701 \ / /
702 `---X--'
703-----------------------------------------------------------------------
704+
705Notice that since `M` is reachable from `R`, the edge from `N` to `M`
706was simplified away. However, `N` still appears in the history as an
707important commit because it "pulled" the change `R` into the main
708branch.
709
Junio C Hamanob73af6c2013-12-03 22:07:11710The `--simplify-by-decoration` option allows you to view only the
Junio C Hamano28363492008-11-14 08:26:31711big picture of the topology of the history, by omitting commits
712that are not referenced by tags. Commits are marked as !TREESAME
713(in other words, kept after history simplification rules described
714above) if (1) they are referenced by tags, or (2) they change the
715contents of the paths given on the command line. All other
716commits are marked as TREESAME (subject to be simplified away).
717
Junio C Hamano8ef91f32019-12-01 22:58:27718ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00719ifdef::git-rev-list[]
Junio C Hamanoa76cb0d2008-08-13 20:04:10720Bisection Helpers
721~~~~~~~~~~~~~~~~~
722
Junio C Hamanob0e02952008-01-19 08:02:00723--bisect::
Junio C Hamanob73af6c2013-12-03 22:07:11724Limit output to the one commit object which is roughly halfway between
725included and excluded commits. Note that the bad bisection ref
726`refs/bisect/bad` is added to the included commits (if it
727exists) and the good bisection refs `refs/bisect/good-*` are
728added to the excluded commits (if they exist). Thus, supposing there
729are no refs in `refs/bisect/`, if
730+
Junio C Hamanob0e02952008-01-19 08:02:00731-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57732$ git rev-list --bisect foo ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00733-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11734+
Junio C Hamanob0e02952008-01-19 08:02:00735outputs 'midpoint', the output of the two commands
Junio C Hamanob73af6c2013-12-03 22:07:11736+
Junio C Hamanob0e02952008-01-19 08:02:00737-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57738$ git rev-list foo ^midpoint
739$ git rev-list midpoint ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00740-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11741+
Junio C Hamanob0e02952008-01-19 08:02:00742would be of roughly the same length. Finding the change which
743introduces a regression is thus reduced to a binary search: repeatedly
744generate and test new 'midpoint's until the commit chain is of length
Junio C Hamano255163d2020-08-18 00:37:23745one.
Junio C Hamanob0e02952008-01-19 08:02:00746
747--bisect-vars::
Junio C Hamanob73af6c2013-12-03 22:07:11748This calculates the same as `--bisect`, except that refs in
749`refs/bisect/` are not used, and except that this outputs
750text ready to be eval'ed by the shell. These lines will assign the
751name of the midpoint revision to the variable `bisect_rev`, and the
752expected number of commits to be tested after `bisect_rev` is tested
753to `bisect_nr`, the expected number of commits to be tested if
754`bisect_rev` turns out to be good to `bisect_good`, the expected
755number of commits to be tested if `bisect_rev` turns out to be bad to
756`bisect_bad`, and the number of commits we are bisecting right now to
757`bisect_all`.
Junio C Hamanob0e02952008-01-19 08:02:00758
759--bisect-all::
Junio C Hamanob73af6c2013-12-03 22:07:11760This outputs all the commit objects between the included and excluded
761commits, ordered by their distance to the included and excluded
762commits. Refs in `refs/bisect/` are not used. The farthest
763from them is displayed first. (This is the only one displayed by
764`--bisect`.)
Junio C Hamano792c5a92009-03-08 08:45:13765+
Junio C Hamanob0e02952008-01-19 08:02:00766This is useful because it makes it easy to choose a good commit to
767test when you want to avoid to test some of them for some reason (they
768may not compile for example).
Junio C Hamano792c5a92009-03-08 08:45:13769+
Junio C Hamanob0e02952008-01-19 08:02:00770This option can be used along with `--bisect-vars`, in this case,
771after all the sorted commit objects, there will be the same text as if
772`--bisect-vars` had been used alone.
773endif::git-rev-list[]
Junio C Hamano8ef91f32019-12-01 22:58:27774endif::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00775
Junio C Hamano8ef91f32019-12-01 22:58:27776ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00777Commit Ordering
778~~~~~~~~~~~~~~~
779
780By default, the commits are shown in reverse chronological order.
781
Junio C Hamanob0e02952008-01-19 08:02:00782--date-order::
Junio C Hamanod0316112012-08-22 19:55:29783Show no parents before all of its children are shown, but
784otherwise show commits in the commit timestamp order.
Junio C Hamanob0e02952008-01-19 08:02:00785
Junio C Hamanoa1952302013-07-01 21:31:18786--author-date-order::
787Show no parents before all of its children are shown, but
788otherwise show commits in the author timestamp order.
789
Junio C Hamanod0316112012-08-22 19:55:29790--topo-order::
791Show no parents before all of its children are shown, and
792avoid showing commits on multiple lines of history
793intermixed.
794+
795For example, in a commit history like this:
796+
797----------------------------------------------------------------
798
799 ---1----2----4----7
800\ \
801 3----5----6----8---
802
803----------------------------------------------------------------
804+
805where the numbers denote the order of commit timestamps, `git
806rev-list` and friends with `--date-order` show the commits in the
807timestamp order: 8 7 6 5 4 3 2 1.
808+
809With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
8103 1); some older commits are shown before newer ones in order to
811avoid showing the commits from two parallel development track mixed
812together.
Junio C Hamanob0e02952008-01-19 08:02:00813
814--reverse::
Junio C Hamanof3ca7b82016-10-03 22:27:02815Output the commits chosen to be shown (see Commit Limiting
816section above) in reverse order. Cannot be combined with
817`--walk-reflogs`.
Junio C Hamano8ef91f32019-12-01 22:58:27818endif::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00819
Junio C Hamano8ef91f32019-12-01 22:58:27820ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00821Object Traversal
822~~~~~~~~~~~~~~~~
823
Junio C Hamano076ffcc2013-02-06 05:13:21824These options are mostly targeted for packing of Git repositories.
Junio C Hamanob0e02952008-01-19 08:02:00825
Junio C Hamano6bb32e62015-02-17 22:11:26826ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00827--objects::
Junio C Hamanob0e02952008-01-19 08:02:00828Print the object IDs of any object referenced by the listed
Junio C Hamanob73af6c2013-12-03 22:07:11829commits. `--objects foo ^bar` thus means ``send me
Junio C Hamanob0e02952008-01-19 08:02:00830all object IDs which I need to download if I have the commit
Junio C Hamanob73af6c2013-12-03 22:07:11831object _bar_ but not _foo_''.
Junio C Hamanob0e02952008-01-19 08:02:00832
Junio C Hamano68e72b72017-12-28 23:20:52833--in-commit-order::
834Print tree and blob ids in order of the commits. The tree
835and blob ids are printed after they are first referenced
836by a commit.
837
Junio C Hamanob0e02952008-01-19 08:02:00838--objects-edge::
Junio C Hamanob73af6c2013-12-03 22:07:11839Similar to `--objects`, but also print the IDs of excluded
840commits prefixed with a ``-'' character. This is used by
Junio C Hamano629edff2015-01-12 23:46:02841linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Junio C Hamanob0e02952008-01-19 08:02:00842objects in deltified form based on objects contained in these
843excluded commits to reduce network traffic.
844
Junio C Hamano629edff2015-01-12 23:46:02845--objects-edge-aggressive::
846Similar to `--objects-edge`, but it tries harder to find excluded
847commits at the cost of increased time. This is used instead of
848`--objects-edge` to build ``thin'' packs for shallow repositories.
849
Junio C Hamano6bb32e62015-02-17 22:11:26850--indexed-objects::
851Pretend as if all trees and blobs used by the index are listed
852on the command line. Note that you probably want to use
853`--objects`, too.
854
Junio C Hamanob0e02952008-01-19 08:02:00855--unpacked::
Junio C Hamanob73af6c2013-12-03 22:07:11856Only useful with `--objects`; print the object IDs that are not
Junio C Hamanob0e02952008-01-19 08:02:00857in packs.
Junio C Hamano0f1291d2017-12-27 19:58:35858
Junio C Hamanoc9f11c22019-07-10 02:54:04859--object-names::
860Only useful with `--objects`; print the names of the object IDs
861that are found. This is the default behavior.
862
863--no-object-names::
864Only useful with `--objects`; does not print the names of the object
865IDs that are found. This inverts `--object-names`. This flag allows
866the output to be more easily parsed by commands such as
867linkgit:git-cat-file[1].
868
Junio C Hamano0f1291d2017-12-27 19:58:35869--filter=<filter-spec>::
870Only useful with one of the `--objects*`; omits objects (usually
871blobs) from the list of printed objects. The '<filter-spec>'
872may be one of the following:
873+
874The form '--filter=blob:none' omits all blobs.
875+
876The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes
877or units. n may be zero. The suffixes k, m, and g can be used to name
878units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same
879as 'blob:limit=1024'.
880+
881The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
882specification contained in the blob (or blob-expression) '<blob-ish>'
883to omit blobs that would not be not required for a sparse checkout on
884the requested refs.
885+
Junio C Hamano94d00a52018-10-30 07:34:40886The form '--filter=tree:<depth>' omits all blobs and trees whose depth
887from the root tree is >= <depth> (minimum depth if an object is located
Junio C Hamano2567b322019-02-05 23:33:56888at multiple depths in the commits traversed). <depth>=0 will not include
889any trees or blobs unless included explicitly in the command-line (or
890standard input when --stdin is used). <depth>=1 will include only the
891tree and blobs which are referenced directly by a commit reachable from
892<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
893while also including trees and blobs one more level removed from an
894explicitly-given commit or tree.
Junio C Hamano0887d042019-06-03 19:55:17895+
896Note that the form '--filter=sparse:path=<path>' that wants to read
897from an arbitrary path on the filesystem has been dropped for security
898reasons.
Junio C Hamanocb705392019-09-18 19:30:01899+
900Multiple '--filter=' flags can be specified to combine filters. Only
901objects which are accepted by every filter are included.
902+
903The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
904used to combined several filters, but this is harder than just repeating
905the '--filter' flag and is usually not necessary. Filters are joined by
906'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
907Besides the '{plus}' and '%' characters, the following characters are
908reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+&#39;&#96;+
909as well as all characters with ASCII code &lt;= `0x20`, which includes
910space and newline.
911+
912Other arbitrary characters can also be encoded. For instance,
913'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
914equivalent.
Junio C Hamano0f1291d2017-12-27 19:58:35915
916--no-filter::
917Turn off any previous `--filter=` argument.
918
919--filter-print-omitted::
920Only useful with `--filter=`; prints a list of the objects omitted
Junio C Hamano6b7d2152019-04-16 12:51:15921by the filter. Object IDs are prefixed with a ``~'' character.
Junio C Hamano0f1291d2017-12-27 19:58:35922
923--missing=<missing-action>::
924A debug option to help with future "partial clone" development.
925This option specifies how missing objects are handled.
926+
927The form '--missing=error' requests that rev-list stop with an error if
928a missing object is encountered. This is the default action.
929+
930The form '--missing=allow-any' will allow object traversal to continue
931if a missing object is encountered. Missing objects will silently be
932omitted from the results.
933+
Junio C Hamano640779d2018-02-14 01:29:14934The form '--missing=allow-promisor' is like 'allow-any', but will only
935allow object traversal to continue for EXPECTED promisor missing objects.
936Unexpected missing objects will raise an error.
937+
Junio C Hamano0f1291d2017-12-27 19:58:35938The form '--missing=print' is like 'allow-any', but will also print a
939list of the missing objects. Object IDs are prefixed with a ``?'' character.
Junio C Hamanob0e02952008-01-19 08:02:00940
Junio C Hamano640779d2018-02-14 01:29:14941--exclude-promisor-objects::
942(For internal use only.) Prefilter object traversal at
943promisor boundary. This is used with partial clone. This is
944stronger than `--missing=allow-promisor` because it limits the
945traversal, rather than just silencing errors about missing
946objects.
Junio C Hamano46fbbcb2018-11-07 03:54:16947endif::git-rev-list[]
Junio C Hamano640779d2018-02-14 01:29:14948
Junio C Hamanoeccdd4a2012-09-10 23:28:17949--no-walk[=(sorted|unsorted)]::
Junio C Hamanoeccdd4a2012-09-10 23:28:17950Only show the given commits, but do not traverse their ancestors.
951This has no effect if a range is specified. If the argument
Junio C Hamanob73af6c2013-12-03 22:07:11952`unsorted` is given, the commits are shown in the order they were
953given on the command line. Otherwise (if `sorted` or no argument
954was given), the commits are shown in reverse chronological order
Junio C Hamanoeccdd4a2012-09-10 23:28:17955by commit time.
Junio C Hamanoef57d1e2015-03-25 21:23:00956Cannot be combined with `--graph`.
Junio C Hamanob0e02952008-01-19 08:02:00957
958--do-walk::
Junio C Hamanob73af6c2013-12-03 22:07:11959Overrides a previous `--no-walk`.
Junio C Hamano8ef91f32019-12-01 22:58:27960endif::git-shortlog[]
Junio C Hamanod2c978f2011-03-20 19:42:22961
Junio C Hamano8ef91f32019-12-01 22:58:27962ifndef::git-shortlog[]
Junio C Hamanod2c978f2011-03-20 19:42:22963Commit Formatting
964~~~~~~~~~~~~~~~~~
965
966ifdef::git-rev-list[]
967Using these options, linkgit:git-rev-list[1] will act similar to the
968more specialized family of commit log tools: linkgit:git-log[1],
969linkgit:git-show[1], and linkgit:git-whatchanged[1]
970endif::git-rev-list[]
971
972include::pretty-options.txt[]
973
974--relative-date::
Junio C Hamanod2c978f2011-03-20 19:42:22975Synonym for `--date=relative`.
976
Junio C Hamano1eb56092015-10-05 20:39:53977--date=<format>::
Junio C Hamanod2c978f2011-03-20 19:42:22978Only takes effect for dates shown in human-readable format, such
Junio C Hamanob73af6c2013-12-03 22:07:11979as when using `--pretty`. `log.date` config variable sets a default
Junio C Hamano1eb56092015-10-05 20:39:53980value for the log command's `--date` option. By default, dates
981are shown in the original time zone (either committer's or
982author's). If `-local` is appended to the format (e.g.,
983`iso-local`), the user's local time zone is used instead.
Junio C Hamanod2c978f2011-03-20 19:42:22984+
Junio C Hamanob5513772019-04-22 03:38:39985--
Junio C Hamanod2c978f2011-03-20 19:42:22986`--date=relative` shows dates relative to the current time,
Junio C Hamanoe548d1b2016-08-08 22:26:49987e.g. ``2 hours ago''. The `-local` option has no effect for
988`--date=relative`.
Junio C Hamanob5513772019-04-22 03:38:39989
Junio C Hamano1eb56092015-10-05 20:39:53990`--date=local` is an alias for `--date=default-local`.
Junio C Hamanob5513772019-04-22 03:38:39991
Junio C Hamanoac12f0e2014-09-19 22:32:51992`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
993The differences to the strict ISO 8601 format are:
994
995- a space instead of the `T` date/time delimiter
996- a space between time and time zone
997- no colon between hours and minutes of the time zone
998
Junio C Hamanoac12f0e2014-09-19 22:32:51999`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
1000ISO 8601 format.
Junio C Hamanob5513772019-04-22 03:38:391001
Junio C Hamanod2c978f2011-03-20 19:42:221002`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Junio C Hamanob73af6c2013-12-03 22:07:111003format, often found in email messages.
Junio C Hamanob5513772019-04-22 03:38:391004
Junio C Hamanob73af6c2013-12-03 22:07:111005`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Junio C Hamanob5513772019-04-22 03:38:391006
Junio C Hamanoe548d1b2016-08-08 22:26:491007`--date=raw` shows the date as seconds since the epoch (1970-01-01
100800:00:00 UTC), followed by a space, and then the timezone as an offset
1009from UTC (a `+` or `-` with four digits; the first two are hours, and
1010the second two are minutes). I.e., as if the timestamp were formatted
1011with `strftime("%s %z")`).
1012Note that the `-local` option does not affect the seconds-since-epoch
1013value (which is always measured in UTC), but does switch the accompanying
1014timezone value.
Junio C Hamanob5513772019-04-22 03:38:391015
Junio C Hamano23168ef2019-02-07 07:20:471016`--date=human` shows the timezone if the timezone does not match the
1017current time-zone, and doesn't print the whole date if that matches
1018(ie skip printing year for dates that are "this year", but also skip
1019the whole date itself if it's in the last few days and we can just say
1020what weekday it was). For older dates the hour and minute is also
1021omitted.
Junio C Hamanob5513772019-04-22 03:38:391022
Junio C Hamanoe548d1b2016-08-08 22:26:491023`--date=unix` shows the date as a Unix epoch timestamp (seconds since
10241970). As with `--raw`, this is always in UTC and therefore `-local`
1025has no effect.
Junio C Hamanob5513772019-04-22 03:38:391026
Junio C Hamano55d91912017-06-22 22:32:461027`--date=format:...` feeds the format `...` to your system `strftime`,
1028except for %z and %Z, which are handled internally.
Junio C Hamanod7ed4042015-08-03 19:43:001029Use `--date=format:%c` to show the date in your system locale's
1030preferred format. See the `strftime` manual for a complete list of
Junio C Hamano1eb56092015-10-05 20:39:531031format placeholders. When using `-local`, the correct syntax is
1032`--date=format-local:...`.
Junio C Hamanob5513772019-04-22 03:38:391033
Junio C Hamano1eb56092015-10-05 20:39:531034`--date=default` is the default format, and is similar to
1035`--date=rfc2822`, with a few exceptions:
Junio C Hamanob5513772019-04-22 03:38:391036--
Junio C Hamano1eb56092015-10-05 20:39:531037- there is no comma after the day-of-week
1038
1039- the time zone is omitted when the local time zone is used
Junio C Hamanod2c978f2011-03-20 19:42:221040
1041ifdef::git-rev-list[]
1042--header::
Junio C Hamanod2c978f2011-03-20 19:42:221043Print the contents of the commit in raw-format; each record is
1044separated with a NUL character.
1045endif::git-rev-list[]
1046
1047--parents::
Junio C Hamanod2c978f2011-03-20 19:42:221048Print also the parents of the commit (in the form "commit parent...").
Junio C Hamanoce019c02017-10-30 05:57:461049Also enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221050
1051--children::
Junio C Hamanod2c978f2011-03-20 19:42:221052Print also the children of the commit (in the form "commit child...").
Junio C Hamanoce019c02017-10-30 05:57:461053Also enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221054
1055ifdef::git-rev-list[]
1056--timestamp::
1057Print the raw commit timestamp.
1058endif::git-rev-list[]
1059
1060--left-right::
Junio C Hamanocd451662016-09-13 00:54:091061Mark which side of a symmetric difference a commit is reachable from.
Junio C Hamanod2c978f2011-03-20 19:42:221062Commits from the left side are prefixed with `<` and those from
1063the right with `>`. If combined with `--boundary`, those
1064commits are prefixed with `-`.
1065+
1066For example, if you have this topology:
1067+
1068-----------------------------------------------------------------------
1069 y---b---b branch B
1070 / \ /
1071 / .
1072 / / \
1073 o---x---a---a branch A
1074-----------------------------------------------------------------------
1075+
1076you would get an output like this:
1077+
1078-----------------------------------------------------------------------
1079$ git rev-list --left-right --boundary --pretty=oneline A...B
1080
1081>bbbbbbb... 3rd on b
1082>bbbbbbb... 2nd on b
1083<aaaaaaa... 3rd on a
1084<aaaaaaa... 2nd on a
1085-yyyyyyy... 1st on b
1086-xxxxxxx... 1st on a
1087-----------------------------------------------------------------------
1088
1089--graph::
Junio C Hamanod2c978f2011-03-20 19:42:221090Draw a text-based graphical representation of the commit history
1091on the left hand side of the output. This may cause extra lines
1092to be printed in between commits, in order for the graph history
1093to be drawn properly.
Junio C Hamanoef57d1e2015-03-25 21:23:001094Cannot be combined with `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:221095+
Junio C Hamanoce019c02017-10-30 05:57:461096This enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221097+
Junio C Hamanob73af6c2013-12-03 22:07:111098This implies the `--topo-order` option by default, but the
1099`--date-order` option may also be specified.
Junio C Hamanod2c978f2011-03-20 19:42:221100
Junio C Hamano624dd4c2014-04-03 21:56:301101--show-linear-break[=<barrier>]::
1102When --graph is not used, all history branches are flattened
1103which can make it hard to see that the two consecutive commits
1104do not belong to a linear branch. This option puts a barrier
1105in between them in that case. If `<barrier>` is specified, it
1106is the string that will be shown instead of the default one.
1107
Junio C Hamanod2c978f2011-03-20 19:42:221108ifdef::git-rev-list[]
1109--count::
1110Print a number stating how many commits would have been
1111listed, and suppress all other output. When used together
Junio C Hamanob73af6c2013-12-03 22:07:111112with `--left-right`, instead print the counts for left and
Junio C Hamanob77f8192011-05-05 01:30:381113right commits, separated by a tab. When used together with
Junio C Hamanob73af6c2013-12-03 22:07:111114`--cherry-mark`, omit patch equivalent commits from these
Junio C Hamanob77f8192011-05-05 01:30:381115counts and print the count for equivalent commits separated
1116by a tab.
Junio C Hamanod2c978f2011-03-20 19:42:221117endif::git-rev-list[]
Junio C Hamano8ef91f32019-12-01 22:58:271118endif::git-shortlog[]