blob: 00ccf68744103d4dc6ffdce5c582c726c2d9ea9d [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 Hamano72ea2ca2022-05-21 00:51:2328--since-as-filter=<date>::
29Show all commits more recent than a specific date. This visits
30all commits in the range, rather than stopping at the first commit which
31is older than a specific date.
32
Junio C Hamanob4a9ede2009-04-08 07:36:3233--until=<date>::
34--before=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0035Show commits older than a specific date.
36
Junio C Hamano4f1d8c42008-03-03 02:01:1637ifdef::git-rev-list[]
Junio C Hamanob4a9ede2009-04-08 07:36:3238--max-age=<timestamp>::
39--min-age=<timestamp>::
Junio C Hamanob0e02952008-01-19 08:02:0040Limit the commits output to specified time range.
Junio C Hamano4f1d8c42008-03-03 02:01:1641endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0042
Junio C Hamanob4a9ede2009-04-08 07:36:3243--author=<pattern>::
44--committer=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0045Limit the commits output to ones with author/committer
Junio C Hamano8ce35d72012-09-18 22:30:4246header lines that match the specified pattern (regular
47expression). With more than one `--author=<pattern>`,
48commits whose author matches any of the given patterns are
49chosen (similarly for multiple `--committer=<pattern>`).
Junio C Hamanob0e02952008-01-19 08:02:0050
Junio C Hamano9954ed72012-10-03 04:54:0051--grep-reflog=<pattern>::
Junio C Hamano9954ed72012-10-03 04:54:0052Limit the commits output to ones with reflog entries that
53match the specified pattern (regular expression). With
54more than one `--grep-reflog`, commits whose reflog message
55matches any of the given patterns are chosen. It is an
56error to use this option unless `--walk-reflogs` is in use.
57
Junio C Hamanob4a9ede2009-04-08 07:36:3258--grep=<pattern>::
Junio C Hamano33be8212023-10-23 21:45:5459Limit the commits output to ones with a log message that
Junio C Hamano8ce35d72012-09-18 22:30:4260matches the specified pattern (regular expression). With
61more than one `--grep=<pattern>`, commits whose message
62matches any of the given patterns are chosen (but see
63`--all-match`).
Junio C Hamano3891e252015-08-31 23:06:1364ifndef::git-rev-list[]
Junio C Hamano9954ed72012-10-03 04:54:0065+
Junio C Hamanob3f862c2019-12-05 22:22:0066When `--notes` is in effect, the message from the notes is
Junio C Hamano8152abf2015-04-28 22:48:0267matched as if it were part of the log message.
Junio C Hamano3891e252015-08-31 23:06:1368endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0069
Junio C Hamanoaa17c7c2008-11-03 04:36:5870--all-match::
Junio C Hamanob73af6c2013-12-03 22:07:1171Limit the commits output to ones that match all given `--grep`,
Junio C Hamano8ce35d72012-09-18 22:30:4272instead of ones that match at least one.
Junio C Hamanoaa17c7c2008-11-03 04:36:5873
Junio C Hamano6bb32e62015-02-17 22:11:2674--invert-grep::
Junio C Hamano33be8212023-10-23 21:45:5475Limit the commits output to ones with a log message that do not
Junio C Hamano6bb32e62015-02-17 22:11:2676match the pattern specified with `--grep=<pattern>`.
77
Junio C Hamanoeb415992008-06-08 22:49:4778-i::
79--regexp-ignore-case::
Junio C Hamanob73af6c2013-12-03 22:07:1180Match the regular expression limiting patterns without regard to letter
81case.
Junio C Hamanob0e02952008-01-19 08:02:0082
Junio C Hamanoa1295452012-11-13 22:32:0483--basic-regexp::
Junio C Hamanoa1295452012-11-13 22:32:0484Consider the limiting patterns to be basic regular expressions;
85this is the default.
86
Junio C Hamanoeb415992008-06-08 22:49:4787-E::
88--extended-regexp::
Junio C Hamanob0e02952008-01-19 08:02:0089Consider the limiting patterns to be extended regular expressions
90instead of the default basic regular expressions.
91
Junio C Hamanoeb415992008-06-08 22:49:4792-F::
93--fixed-strings::
Junio C Hamano24bc09a2008-02-28 00:27:4494Consider the limiting patterns to be fixed strings (don't interpret
95pattern as a regular expression).
96
Junio C Hamanoa275c1f2017-06-19 20:10:1297-P::
Junio C Hamanoa1295452012-11-13 22:32:0498--perl-regexp::
Junio C Hamano222ed822017-06-02 06:24:0699Consider the limiting patterns to be Perl-compatible regular
100expressions.
101+
102Support for these types of regular expressions is an optional
103compile-time dependency. If Git wasn't compiled with support for them
104providing this option will cause it to die.
Junio C Hamanoa1295452012-11-13 22:32:04105
Junio C Hamanob0e02952008-01-19 08:02:00106--remove-empty::
Junio C Hamanob0e02952008-01-19 08:02:00107Stop when a given path disappears from the tree.
108
Junio C Hamano934e1782009-07-16 06:59:15109--merges::
Junio C Hamanof32ce262011-03-27 07:35:11110Print only merge commits. This is exactly the same as `--min-parents=2`.
Junio C Hamano934e1782009-07-16 06:59:15111
Junio C Hamanob0e02952008-01-19 08:02:00112--no-merges::
Junio C Hamanof32ce262011-03-27 07:35:11113Do not print commits with more than one parent. This is
114exactly the same as `--max-parents=1`.
115
116--min-parents=<number>::
117--max-parents=<number>::
118--no-min-parents::
119--no-max-parents::
Junio C Hamanoc5bb3b32013-08-05 22:43:36120Show only commits which have at least (or at most) that many parent
Junio C Hamanof32ce262011-03-27 07:35:11121commits. In particular, `--max-parents=1` is the same as `--no-merges`,
122`--min-parents=2` is the same as `--merges`. `--max-parents=0`
123gives all root commits and `--min-parents=3` all octopus merges.
124+
125`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
126again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
127parents) and `--max-parents=-1` (negative numbers denote no upper limit).
Junio C Hamanob0e02952008-01-19 08:02:00128
129--first-parent::
Junio C Hamano034a2ff2022-02-18 00:40:11130When finding commits to include, follow only the first
131parent commit upon seeing a merge commit. This option
132can give a better overview when viewing the evolution of
133a particular topic branch, because merges into a topic
134branch tend to be only about adjusting to updated upstream
135from time to time, and this option allows you to ignore
136the individual commits brought in to your history by such
137a merge.
Junio C Hamano8c860d62021-02-06 01:37:47138ifdef::git-log[]
Junio C Hamanoa372d5b2021-02-26 01:34:37139+
140This option also changes default diff format for merge commits
141to `first-parent`, see `--diff-merges=first-parent` for details.
Junio C Hamano8c860d62021-02-06 01:37:47142endif::git-log[]
143
Junio C Hamano034a2ff2022-02-18 00:40:11144--exclude-first-parent-only::
145When finding commits to exclude (with a '{caret}'), follow only
146the first parent commit upon seeing a merge commit.
147This can be used to find the set of changes in a topic branch
148from the point where it diverged from the remote branch, given
149that arbitrary merges can be valid topic branch changes.
150
Junio C Hamanob0e02952008-01-19 08:02:00151--not::
Junio C Hamanob0e02952008-01-19 08:02:00152Reverses the meaning of the '{caret}' prefix (or lack thereof)
Junio C Hamanob73af6c2013-12-03 22:07:11153for all following revision specifiers, up to the next `--not`.
Junio C Hamano293a47b2023-10-04 22:45:56154When used on the command line before --stdin, the revisions passed
155through stdin will not be affected by it. Conversely, when passed
156via standard input, the revisions passed on the command line will
157not be affected by it.
Junio C Hamanob0e02952008-01-19 08:02:00158
159--all::
Junio C Hamanoe89102f2017-02-15 23:18:15160Pretend as if all the refs in `refs/`, along with `HEAD`, are
161listed on the command line as '<commit>'.
Junio C Hamanob0e02952008-01-19 08:02:00162
Junio C Hamanod2179ef2010-10-22 04:12:17163--branches[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14164Pretend as if all the refs in `refs/heads` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17165on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano57827fb2010-01-23 03:02:50166branches to ones matching given shell glob. If pattern lacks '?',
Junio C Hamano81d540a2012-03-02 19:52:47167'{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56168
Junio C Hamanod2179ef2010-10-22 04:12:17169--tags[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14170Pretend as if all the refs in `refs/tags` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17171on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano81d540a2012-03-02 19:52:47172tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
173or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56174
Junio C Hamanod2179ef2010-10-22 04:12:17175--remotes[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14176Pretend as if all the refs in `refs/remotes` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17177on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano97bcb482010-11-25 03:16:07178remote-tracking branches to ones matching given shell glob.
Junio C Hamano81d540a2012-03-02 19:52:47179If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50180
Junio C Hamanod2179ef2010-10-22 04:12:17181--glob=<glob-pattern>::
182Pretend as if all the refs matching shell glob '<glob-pattern>'
Junio C Hamano57827fb2010-01-23 03:02:50183are listed on the command line as '<commit>'. Leading 'refs/',
Junio C Hamano81d540a2012-03-02 19:52:47184is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
185or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50186
Junio C Hamanof079f702013-12-06 23:43:18187--exclude=<glob-pattern>::
188
189Do not include refs matching '<glob-pattern>' that the next `--all`,
190`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
191consider. Repetitions of this option accumulate exclusion patterns
192up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
193`--glob` option (other options or arguments do not clear
Junio C Hamanofb5ffde2014-11-04 22:38:56194accumulated patterns).
Junio C Hamanof079f702013-12-06 23:43:18195+
196The patterns given should not begin with `refs/heads`, `refs/tags`, or
197`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
198respectively, and they must begin with `refs/` when applied to `--glob`
199or `--all`. If a trailing '/{asterisk}' is intended, it must be given
200explicitly.
201
Junio C Hamano42ce67d2023-03-17 21:36:41202--exclude-hidden=[fetch|receive|uploadpack]::
203Do not include refs that would be hidden by `git-fetch`,
204`git-receive-pack` or `git-upload-pack` by consulting the appropriate
205`fetch.hideRefs`, `receive.hideRefs` or `uploadpack.hideRefs`
206configuration along with `transfer.hideRefs` (see
Junio C Hamanoe6ab9192022-11-23 04:01:36207linkgit:git-config[1]). This option affects the next pseudo-ref option
208`--all` or `--glob` and is cleared after processing them.
209
Junio C Hamano2a4bcbc2014-10-29 20:07:39210--reflog::
211Pretend as if all objects mentioned by reflogs are listed on the
212command line as `<commit>`.
213
Junio C Hamanoa42e0332019-07-19 19:49:37214--alternate-refs::
215Pretend as if all objects mentioned as ref tips of alternate
216repositories were listed on the command line. An alternate
217repository is any repository whose object directory is specified
218in `objects/info/alternates`. The set of included objects may
219be modified by `core.alternateRefsCommand`, etc. See
220linkgit:git-config[1].
221
Junio C Hamano8d57fa92017-09-19 05:01:08222--single-worktree::
223By default, all working trees will be examined by the
224following options when there are more than one (see
225linkgit:git-worktree[1]): `--all`, `--reflog` and
226`--indexed-objects`.
227This option forces them to examine the current working tree
228only.
229
Junio C Hamano084228c2011-05-30 08:13:52230--ignore-missing::
Junio C Hamano084228c2011-05-30 08:13:52231Upon seeing an invalid object name in the input, pretend as if
232the bad input was not given.
Junio C Hamano50819852008-11-19 02:07:56233
Junio C Hamano5706e0b2009-11-24 10:54:16234ifndef::git-rev-list[]
235--bisect::
Junio C Hamano4fdccb22010-02-19 09:58:14236Pretend as if the bad bisection ref `refs/bisect/bad`
Junio C Hamano5706e0b2009-11-24 10:54:16237was listed and as if it was followed by `--not` and the good
Junio C Hamano4fdccb22010-02-19 09:58:14238bisection refs `refs/bisect/good-*` on the command
Junio C Hamano255163d2020-08-18 00:37:23239line.
Junio C Hamano5706e0b2009-11-24 10:54:16240endif::git-rev-list[]
241
Junio C Hamanob0e02952008-01-19 08:02:00242--stdin::
Junio C Hamano0f401e12023-07-05 05:23:09243In addition to getting arguments from the command line, read
Junio C Hamano6018d902023-08-18 00:20:22244them from standard input as well. This accepts commits and
Junio C Hamano0f401e12023-07-05 05:23:09245pseudo-options like `--all` and `--glob=`. When a `--` separator
246is seen, the following input is treated as paths and used to
Junio C Hamano293a47b2023-10-04 22:45:56247limit the result. Flags like `--not` which are read via standard input
248are only respected for arguments passed in the same way and will not
249influence any subsequent command line arguments.
Junio C Hamanob0e02952008-01-19 08:02:00250
Junio C Hamano5706e0b2009-11-24 10:54:16251ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00252--quiet::
Junio C Hamanob0e02952008-01-19 08:02:00253Don't print anything to standard output. This form
254is primarily meant to allow the caller to
255test the exit status to see if a range of objects is fully
256connected (or not). It is faster than redirecting stdout
Junio C Hamanob73af6c2013-12-03 22:07:11257to `/dev/null` as the output does not have to be formatted.
Junio C Hamanoa372d5b2021-02-26 01:34:37258
259--disk-usage::
Junio C Hamano04495a12022-08-18 21:13:08260--disk-usage=human::
Junio C Hamanoa372d5b2021-02-26 01:34:37261Suppress normal output; instead, print the sum of the bytes used
262for on-disk storage by the selected commits or objects. This is
263equivalent to piping the output into `git cat-file
264--batch-check='%(objectsize:disk)'`, except that it runs much
265faster (especially with `--use-bitmap-index`). See the `CAVEATS`
266section in linkgit:git-cat-file[1] for the limitations of what
267"on-disk storage" means.
Junio C Hamano04495a12022-08-18 21:13:08268With the optional value `human`, on-disk storage size is shown
269in human-readable string(e.g. 12.24 Kib, 3.50 Mib).
Junio C Hamano69cd7c52008-06-04 07:52:59270endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00271
Junio C Hamano9a2fb2d2011-03-23 05:40:15272--cherry-mark::
Junio C Hamano9a2fb2d2011-03-23 05:40:15273Like `--cherry-pick` (see below) but mark equivalent commits
274with `=` rather than omitting them, and inequivalent ones with `+`.
275
Junio C Hamanob0e02952008-01-19 08:02:00276--cherry-pick::
Junio C Hamanob0e02952008-01-19 08:02:00277Omit any commit that introduces the same change as
Junio C Hamanob73af6c2013-12-03 22:07:11278another commit on the ``other side'' when the set of
Junio C Hamanob0e02952008-01-19 08:02:00279commits are limited with symmetric difference.
280+
281For example, if you have two branches, `A` and `B`, a usual way
282to list all commits on only one side of them is with
Junio C Hamano5cd15182011-04-05 00:21:10283`--left-right` (see the example below in the description of
Junio C Hamanob73af6c2013-12-03 22:07:11284the `--left-right` option). However, it shows the commits that were
285cherry-picked from the other branch (for example, ``3rd on b'' may be
286cherry-picked from branch A). With this option, such pairs of commits are
Junio C Hamanob0e02952008-01-19 08:02:00287excluded from the output.
288
Junio C Hamano9a2fb2d2011-03-23 05:40:15289--left-only::
290--right-only::
Junio C Hamanocd451662016-09-13 00:54:09291List only commits on the respective side of a symmetric difference,
Junio C Hamano9a2fb2d2011-03-23 05:40:15292i.e. only those which would be marked `<` resp. `>` by
293`--left-right`.
294+
295For example, `--cherry-pick --right-only A...B` omits those
296commits from `B` which are in `A` or are patch-equivalent to a commit in
Junio C Hamanob76a6862012-05-02 22:02:46297`A`. In other words, this lists the `+` commits from `git cherry A B`.
Junio C Hamano9a2fb2d2011-03-23 05:40:15298More precisely, `--cherry-pick --right-only --no-merges` gives the exact
299list.
300
301--cherry::
Junio C Hamano9a2fb2d2011-03-23 05:40:15302A synonym for `--right-only --cherry-mark --no-merges`; useful to
303limit the output to the commits on our side and mark those that
304have been applied to the other side of a forked history with
305`git log --cherry upstream...mybranch`, similar to
306`git cherry upstream mybranch`.
307
Junio C Hamanoeb415992008-06-08 22:49:47308-g::
309--walk-reflogs::
Junio C Hamanob0e02952008-01-19 08:02:00310Instead of walking the commit ancestry chain, walk
311reflog entries from the most recent one to older ones.
312When this option is used you cannot specify commits to
313exclude (that is, '{caret}commit', 'commit1..commit2',
Junio C Hamanod75148a2014-04-08 19:48:38314and 'commit1\...commit2' notations cannot be used).
Junio C Hamanob0e02952008-01-19 08:02:00315+
Junio C Hamanob4896852019-12-10 23:15:09316With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
Junio C Hamanob0e02952008-01-19 08:02:00317this causes the output to have two extra lines of information
Junio C Hamanoe548d1b2016-08-08 22:26:49318taken from the reflog. The reflog designator in the output may be shown
Junio C Hamano8842ccc2024-03-26 00:26:23319as `ref@{<Nth>}` (where _<Nth>_ is the reverse-chronological index in the
320reflog) or as `ref@{<timestamp>}` (with the _<timestamp>_ for that entry),
Junio C Hamanoe548d1b2016-08-08 22:26:49321depending on a few rules:
322+
323--
Junio C Hamano8842ccc2024-03-26 00:26:233241. If the starting point is specified as `ref@{<Nth>}`, show the index
Junio C Hamano2567b322019-02-05 23:33:56325 format.
Junio C Hamanoe548d1b2016-08-08 22:26:49326+
3272. If the starting point was specified as `ref@{now}`, show the
Junio C Hamano2567b322019-02-05 23:33:56328 timestamp format.
Junio C Hamanoe548d1b2016-08-08 22:26:49329+
3303. If neither was used, but `--date` was given on the command line, show
Junio C Hamano2567b322019-02-05 23:33:56331 the timestamp in the format requested by `--date`.
Junio C Hamanoe548d1b2016-08-08 22:26:49332+
3334. Otherwise, show the index format.
334--
335+
336Under `--pretty=oneline`, the commit message is
Junio C Hamanob0e02952008-01-19 08:02:00337prefixed with this information on the same line.
Junio C Hamanob73af6c2013-12-03 22:07:11338This option cannot be combined with `--reverse`.
Junio C Hamanob0e02952008-01-19 08:02:00339See also linkgit:git-reflog[1].
Junio C Hamanob4896852019-12-10 23:15:09340+
341Under `--pretty=reference`, this information will not be shown at all.
Junio C Hamanob0e02952008-01-19 08:02:00342
343--merge::
Junio C Hamanod2c69b62024-03-08 00:03:23344Show commits touching conflicted paths in the range `HEAD...<other>`,
345where `<other>` is the first existing pseudoref in `MERGE_HEAD`,
346`CHERRY_PICK_HEAD`, `REVERT_HEAD` or `REBASE_HEAD`. Only works
347when the index has unmerged entries. This option can be used to show
348relevant commits when resolving conflicts from a 3-way merge.
Junio C Hamanob0e02952008-01-19 08:02:00349
350--boundary::
Junio C Hamano27159f82013-06-14 17:19:22351Output excluded boundary commits. Boundary commits are
352prefixed with `-`.
Junio C Hamanob0e02952008-01-19 08:02:00353
Junio C Hamano5b3533d2014-02-27 23:07:15354ifdef::git-rev-list[]
355--use-bitmap-index::
356
357Try to speed up the traversal using the pack bitmap index (if
358one is available). Note that when traversing with `--objects`,
359trees and blobs will not have their associated path printed.
Junio C Hamanoe48a1132016-08-03 22:40:21360
361--progress=<header>::
362Show progress reports on stderr as objects are considered. The
363`<header>` text will be printed with each progress update.
Junio C Hamano5b3533d2014-02-27 23:07:15364endif::git-rev-list[]
365
Junio C Hamanoa76cb0d2008-08-13 20:04:10366History Simplification
367~~~~~~~~~~~~~~~~~~~~~~
368
Junio C Hamano28363492008-11-14 08:26:31369Sometimes you are only interested in parts of the history, for example the
370commits modifying a particular <path>. But there are two parts of
371'History Simplification', one part is selecting the commits and the other
372is how to do it, as there are various strategies to simplify the history.
373
374The following options select the commits to be shown:
375
376<paths>::
Junio C Hamano28363492008-11-14 08:26:31377Commits modifying the given <paths> are selected.
378
379--simplify-by-decoration::
Junio C Hamano28363492008-11-14 08:26:31380Commits that are referred by some branch or tag are selected.
381
382Note that extra commits can be shown to give a meaningful history.
383
384The following options affect the way the simplification is performed:
385
386Default mode::
Junio C Hamano28363492008-11-14 08:26:31387Simplifies the history to the simplest history explaining the
388final state of the tree. Simplest because it prunes some side
389branches if the end result is the same (i.e. merging branches
390with the same content)
391
Junio C Hamano67bf2242020-04-22 21:41:44392--show-pulls::
393Include all commits from the default mode, but also any merge
394commits that are not TREESAME to the first parent but are
395TREESAME to a later parent. This mode is helpful for showing
396the merge commits that "first introduced" a change to a branch.
397
Junio C Hamano28363492008-11-14 08:26:31398--full-history::
Junio C Hamano15567bc2011-07-23 00:51:59399Same as the default mode, but does not prune some history.
Junio C Hamano28363492008-11-14 08:26:31400
401--dense::
Junio C Hamano28363492008-11-14 08:26:31402Only the selected commits are shown, plus some to have a
403meaningful history.
404
405--sparse::
Junio C Hamano28363492008-11-14 08:26:31406All commits in the simplified history are shown.
407
408--simplify-merges::
Junio C Hamanob73af6c2013-12-03 22:07:11409Additional option to `--full-history` to remove some needless
Junio C Hamano28363492008-11-14 08:26:31410merges from the resulting history, as there are no selected
411commits contributing to this merge.
412
Junio C Hamano594d2d42022-08-30 17:58:50413--ancestry-path[=<commit>]::
Junio C Hamano89a57342010-06-22 23:22:55414When given a range of commits to display (e.g. 'commit1..commit2'
Junio C Hamano594d2d42022-08-30 17:58:50415or 'commit2 {caret}commit1'), only display commits in that range
416that are ancestors of <commit>, descendants of <commit>, or
417<commit> itself. If no commit is specified, use 'commit1' (the
418excluded part of the range) as <commit>. Can be passed multiple
419times; if so, a commit is included if it is any of the commits
420given or if it is an ancestor or descendant of one of them.
Junio C Hamano89a57342010-06-22 23:22:55421
Junio C Hamano28363492008-11-14 08:26:31422A more detailed explanation follows.
Junio C Hamanoa76cb0d2008-08-13 20:04:10423
424Suppose you specified `foo` as the <paths>. We shall call commits
425that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
426filtered for `foo`, they look different and equal, respectively.)
427
428In the following, we will always refer to the same example history to
429illustrate the differences between simplification settings. We assume
430that you are filtering for a file `foo` in this commit graph:
431-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22432 .-A---M---N---O---P---Q
433 / / / / / /
434I B C D E Y
435 \ / / / / /
436 `-------------' X
Junio C Hamanoa76cb0d2008-08-13 20:04:10437-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22438The horizontal line of history A---Q is taken to be the first parent of
Junio C Hamanoa76cb0d2008-08-13 20:04:10439each merge. The commits are:
440
441* `I` is the initial commit, in which `foo` exists with contents
Junio C Hamanob73af6c2013-12-03 22:07:11442 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Junio C Hamanoa76cb0d2008-08-13 20:04:10443 commits are compared to an empty tree, so `I` is !TREESAME.
444
Junio C Hamanob73af6c2013-12-03 22:07:11445* In `A`, `foo` contains just ``foo''.
Junio C Hamanoa76cb0d2008-08-13 20:04:10446
447* `B` contains the same change as `A`. Its merge `M` is trivial and
448 hence TREESAME to all parents.
449
Junio C Hamanob73af6c2013-12-03 22:07:11450* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Junio C Hamanoa76cb0d2008-08-13 20:04:10451 so it is not TREESAME to any parent.
452
Junio C Hamanob73af6c2013-12-03 22:07:11453* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
454 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
Junio C Hamanoa76cb0d2008-08-13 20:04:10455
Junio C Hamanob73af6c2013-12-03 22:07:11456* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
457 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
Junio C Hamano27159f82013-06-14 17:19:22458
Junio C Hamanod7fccbf2013-07-25 03:24:57459* `X` is an independent root commit that added a new file `side`, and `Y`
Junio C Hamano27159f82013-06-14 17:19:22460 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
461 `Q` is TREESAME to `P`, but not to `Y`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10462
Junio C Hamanob73af6c2013-12-03 22:07:11463`rev-list` walks backwards through history, including or excluding
464commits based on whether `--full-history` and/or parent rewriting
465(via `--parents` or `--children`) are used. The following settings
Junio C Hamanoa76cb0d2008-08-13 20:04:10466are available.
467
468Default mode::
Junio C Hamanoa76cb0d2008-08-13 20:04:10469Commits are included if they are not TREESAME to any parent
Junio C Hamanob73af6c2013-12-03 22:07:11470(though this can be changed, see `--sparse` below). If the
Junio C Hamanoa76cb0d2008-08-13 20:04:10471commit was a merge, and it was TREESAME to one parent, follow
472only that parent. (Even if there are several TREESAME
473parents, follow only one of them.) Otherwise, follow all
474parents.
475+
476This results in:
477+
478-----------------------------------------------------------------------
479 .-A---N---O
Junio C Hamano89a57342010-06-22 23:22:55480 / / /
Junio C Hamanoa76cb0d2008-08-13 20:04:10481I---------D
482-----------------------------------------------------------------------
483+
484Note how the rule to only follow the TREESAME parent, if one is
485available, removed `B` from consideration entirely. `C` was
486considered via `N`, but is TREESAME. Root commits are compared to an
487empty tree, so `I` is !TREESAME.
488+
Junio C Hamanob73af6c2013-12-03 22:07:11489Parent/child relations are only visible with `--parents`, but that does
Junio C Hamanoa76cb0d2008-08-13 20:04:10490not affect the commits selected in default mode, so we have shown the
491parent lines.
492
493--full-history without parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10494This mode differs from the default in one point: always follow
495all parents of a merge, even if it is TREESAME to one of them.
496Even if more than one side of the merge has commits that are
497included, this does not imply that the merge itself is! In
498the example, we get
499+
500-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22501I A B N D O P Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10502-----------------------------------------------------------------------
503+
Junio C Hamano27159f82013-06-14 17:19:22504`M` was excluded because it is TREESAME to both parents. `E`,
Junio C Hamanoa76cb0d2008-08-13 20:04:10505`C` and `B` were all walked, but only `B` was !TREESAME, so the others
506do not appear.
507+
508Note that without parent rewriting, it is not really possible to talk
509about the parent/child relationships between the commits, so we show
510them disconnected.
511
512--full-history with parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10513Ordinary commits are only included if they are !TREESAME
Junio C Hamanob73af6c2013-12-03 22:07:11514(though this can be changed, see `--sparse` below).
Junio C Hamanoa76cb0d2008-08-13 20:04:10515+
516Merges are always included. However, their parent list is rewritten:
517Along each parent, prune away commits that are not included
518themselves. This results in
519+
520-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22521 .-A---M---N---O---P---Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10522 / / / / /
523I B / D /
524 \ / / / /
525 `-------------'
526-----------------------------------------------------------------------
527+
Junio C Hamanob73af6c2013-12-03 22:07:11528Compare to `--full-history` without rewriting above. Note that `E`
Junio C Hamanoa76cb0d2008-08-13 20:04:10529was pruned away because it is TREESAME, but the parent list of P was
530rewritten to contain `E`'s parent `I`. The same happened for `C` and
Junio C Hamano27159f82013-06-14 17:19:22531`N`, and `X`, `Y` and `Q`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10532
533In addition to the above settings, you can change whether TREESAME
534affects inclusion:
535
Junio C Hamanoeb415992008-06-08 22:49:47536--dense::
Junio C Hamanoa76cb0d2008-08-13 20:04:10537Commits that are walked are included if they are not TREESAME
538to any parent.
539
Junio C Hamanoeb415992008-06-08 22:49:47540--sparse::
Junio C Hamanoa76cb0d2008-08-13 20:04:10541All commits that are walked are included.
542+
Junio C Hamanob73af6c2013-12-03 22:07:11543Note that without `--full-history`, this still simplifies merges: if
Junio C Hamanoa76cb0d2008-08-13 20:04:10544one of the parents is TREESAME, we follow only that one, so the other
545sides of the merge are never walked.
Junio C Hamanob0e02952008-01-19 08:02:00546
Junio C Hamanoa2f46622008-09-03 05:20:31547--simplify-merges::
Junio C Hamanoa2f46622008-09-03 05:20:31548First, build a history graph in the same way that
Junio C Hamanob73af6c2013-12-03 22:07:11549`--full-history` with parent rewriting does (see above).
Junio C Hamanoa2f46622008-09-03 05:20:31550+
551Then simplify each commit `C` to its replacement `C'` in the final
552history according to the following rules:
553+
554--
555* Set `C'` to `C`.
556+
557* Replace each parent `P` of `C'` with its simplification `P'`. In
Junio C Hamano27159f82013-06-14 17:19:22558 the process, drop parents that are ancestors of other parents or that are
559 root commits TREESAME to an empty tree, and remove duplicates, but take care
560 to never drop all parents that we are TREESAME to.
Junio C Hamanoa2f46622008-09-03 05:20:31561+
562* If after this parent rewriting, `C'` is a root or merge commit (has
563 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
564 Otherwise, it is replaced with its only parent.
565--
566+
567The effect of this is best shown by way of comparing to
Junio C Hamanob73af6c2013-12-03 22:07:11568`--full-history` with parent rewriting. The example turns into:
Junio C Hamanoa2f46622008-09-03 05:20:31569+
570-----------------------------------------------------------------------
571 .-A---M---N---O
572 / / /
573I B D
574 \ / /
575 `---------'
576-----------------------------------------------------------------------
577+
Junio C Hamanob73af6c2013-12-03 22:07:11578Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Junio C Hamanoa2f46622008-09-03 05:20:31579+
580--
581* `N`'s parent list had `I` removed, because it is an ancestor of the
582 other parent `M`. Still, `N` remained because it is !TREESAME.
583+
584* `P`'s parent list similarly had `I` removed. `P` was then
585 removed completely, because it had one parent and is TREESAME.
Junio C Hamano27159f82013-06-14 17:19:22586+
587* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
588 was a TREESAME root. `Q` was then removed completely, because it had one
589 parent and is TREESAME.
Junio C Hamanoa2f46622008-09-03 05:20:31590--
Junio C Hamanob0e02952008-01-19 08:02:00591
Junio C Hamano67bf2242020-04-22 21:41:44592There is another simplification mode available:
Junio C Hamano89a57342010-06-22 23:22:55593
Junio C Hamano594d2d42022-08-30 17:58:50594--ancestry-path[=<commit>]::
595Limit the displayed commits to those which are an ancestor of
596<commit>, or which are a descendant of <commit>, or are <commit>
597itself.
Junio C Hamano89a57342010-06-22 23:22:55598+
599As an example use case, consider the following commit history:
600+
601-----------------------------------------------------------------------
602 D---E-------F
603 / \ \
604 B---C---G---H---I---J
605 / \
606A-------K---------------L--M
607-----------------------------------------------------------------------
608+
609A regular 'D..M' computes the set of commits that are ancestors of `M`,
610but excludes the ones that are ancestors of `D`. This is useful to see
611what happened to the history leading to `M` since `D`, in the sense
Junio C Hamanob73af6c2013-12-03 22:07:11612that ``what does `M` have that did not exist in `D`''. The result in this
Junio C Hamano89a57342010-06-22 23:22:55613example would be all the commits, except `A` and `B` (and `D` itself,
614of course).
615+
616When we want to find out what commits in `M` are contaminated with the
617bug introduced by `D` and need fixing, however, we might want to view
618only the subset of 'D..M' that are actually descendants of `D`, i.e.
Junio C Hamanob73af6c2013-12-03 22:07:11619excluding `C` and `K`. This is exactly what the `--ancestry-path`
Junio C Hamano89a57342010-06-22 23:22:55620option does. Applied to the 'D..M' range, it results in:
621+
622-----------------------------------------------------------------------
623E-------F
624 \ \
625 G---H---I---J
626 \
627L--M
628-----------------------------------------------------------------------
Junio C Hamano594d2d42022-08-30 17:58:50629+
630We can also use `--ancestry-path=D` instead of `--ancestry-path` which
631means the same thing when applied to the 'D..M' range but is just more
632explicit.
633+
634If we instead are interested in a given topic within this range, and all
635commits affected by that topic, we may only want to view the subset of
636`D..M` which contain that topic in their ancestry path. So, using
637`--ancestry-path=H D..M` for example would result in:
638+
639-----------------------------------------------------------------------
640E
641 \
642 G---H---I---J
643 \
644L--M
645-----------------------------------------------------------------------
646+
647Whereas `--ancestry-path=K D..M` would result in
648+
649-----------------------------------------------------------------------
650K---------------L--M
651-----------------------------------------------------------------------
Junio C Hamano89a57342010-06-22 23:22:55652
Junio C Hamano67bf2242020-04-22 21:41:44653Before discussing another option, `--show-pulls`, we need to
654create a new example history.
Junio C Hamano0cb719f2020-05-31 20:04:39655
Junio C Hamano67bf2242020-04-22 21:41:44656A common problem users face when looking at simplified history is that a
657commit they know changed a file somehow does not appear in the file's
658simplified history. Let's demonstrate a new example and show how options
659such as `--full-history` and `--simplify-merges` works in that case:
Junio C Hamano0cb719f2020-05-31 20:04:39660
Junio C Hamano67bf2242020-04-22 21:41:44661-----------------------------------------------------------------------
662 .-A---M-----C--N---O---P
663 / / \ \ \/ / /
664I B \ R-'`-Z' /
665 \ / \/ /
666 \ / /\ /
667 `---X--' `---Y--'
668-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39669
Junio C Hamano67bf2242020-04-22 21:41:44670For this example, suppose `I` created `file.txt` which was modified by
671`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`,
672and `Y` do not change `file.txt`. The merge commit `M` was created by
673resolving the merge conflict to include both changes from `A` and `B`
674and hence is not TREESAME to either. The merge commit `R`, however, was
675created by ignoring the contents of `file.txt` at `M` and taking only
676the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not
677`M`. Finally, the natural merge resolution to create `N` is to take the
678contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.
679The merge commits `O` and `P` are TREESAME to their first parents, but
680not to their second parents, `Z` and `Y` respectively.
Junio C Hamano0cb719f2020-05-31 20:04:39681
Junio C Hamano67bf2242020-04-22 21:41:44682When using the default mode, `N` and `R` both have a TREESAME parent, so
683those edges are walked and the others are ignored. The resulting history
684graph is:
Junio C Hamano0cb719f2020-05-31 20:04:39685
Junio C Hamano67bf2242020-04-22 21:41:44686-----------------------------------------------------------------------
687I---X
688-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39689
Junio C Hamano67bf2242020-04-22 21:41:44690When using `--full-history`, Git walks every edge. This will discover
691the commits `A` and `B` and the merge `M`, but also will reveal the
692merge commits `O` and `P`. With parent rewriting, the resulting graph is:
Junio C Hamano0cb719f2020-05-31 20:04:39693
Junio C Hamano67bf2242020-04-22 21:41:44694-----------------------------------------------------------------------
695 .-A---M--------N---O---P
696 / / \ \ \/ / /
697I B \ R-'`--' /
698 \ / \/ /
699 \ / /\ /
700 `---X--' `------'
701-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39702
Junio C Hamano67bf2242020-04-22 21:41:44703Here, the merge commits `O` and `P` contribute extra noise, as they did
704not actually contribute a change to `file.txt`. They only merged a topic
705that was based on an older version of `file.txt`. This is a common
706issue in repositories using a workflow where many contributors work in
Junio C Hamano594d2d42022-08-30 17:58:50707parallel and merge their topic branches along a single trunk: many
Junio C Hamano67bf2242020-04-22 21:41:44708unrelated merges appear in the `--full-history` results.
Junio C Hamano0cb719f2020-05-31 20:04:39709
Junio C Hamano67bf2242020-04-22 21:41:44710When using the `--simplify-merges` option, the commits `O` and `P`
711disappear from the results. This is because the rewritten second parents
712of `O` and `P` are reachable from their first parents. Those edges are
713removed and then the commits look like single-parent commits that are
714TREESAME to their parent. This also happens to the commit `N`, resulting
715in a history view as follows:
Junio C Hamano0cb719f2020-05-31 20:04:39716
Junio C Hamano67bf2242020-04-22 21:41:44717-----------------------------------------------------------------------
718 .-A---M--.
719 / / \
720I B R
721 \ / /
722 \ / /
723 `---X--'
724-----------------------------------------------------------------------
Junio C Hamano0cb719f2020-05-31 20:04:39725
Junio C Hamano67bf2242020-04-22 21:41:44726In this view, we see all of the important single-parent changes from
727`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the
728not-so-carefully-resolved merge `R`. This is usually enough information
729to determine why the commits `A` and `B` "disappeared" from history in
730the default view. However, there are a few issues with this approach.
Junio C Hamano0cb719f2020-05-31 20:04:39731
Junio C Hamano67bf2242020-04-22 21:41:44732The first issue is performance. Unlike any previous option, the
733`--simplify-merges` option requires walking the entire commit history
734before returning a single result. This can make the option difficult to
735use for very large repositories.
Junio C Hamano0cb719f2020-05-31 20:04:39736
Junio C Hamano67bf2242020-04-22 21:41:44737The second issue is one of auditing. When many contributors are working
738on the same repository, it is important which merge commits introduced
739a change into an important branch. The problematic merge `R` above is
740not likely to be the merge commit that was used to merge into an
741important branch. Instead, the merge `N` was used to merge `R` and `X`
742into the important branch. This commit may have information about why
743the change `X` came to override the changes from `A` and `B` in its
744commit message.
Junio C Hamano0cb719f2020-05-31 20:04:39745
746--show-pulls::
747In addition to the commits shown in the default history, show
748each merge commit that is not TREESAME to its first parent but
749is TREESAME to a later parent.
Junio C Hamano67bf2242020-04-22 21:41:44750+
Junio C Hamano0cb719f2020-05-31 20:04:39751When a merge commit is included by `--show-pulls`, the merge is
Junio C Hamano67bf2242020-04-22 21:41:44752treated as if it "pulled" the change from another branch. When using
753`--show-pulls` on this example (and no other options) the resulting
754graph is:
755+
756-----------------------------------------------------------------------
757I---X---R---N
758-----------------------------------------------------------------------
759+
760Here, the merge commits `R` and `N` are included because they pulled
761the commits `X` and `R` into the base branch, respectively. These
762merges are the reason the commits `A` and `B` do not appear in the
763default history.
764+
765When `--show-pulls` is paired with `--simplify-merges`, the
766graph includes all of the necessary information:
767+
768-----------------------------------------------------------------------
769 .-A---M--. N
770 / / \ /
771I B R
772 \ / /
773 \ / /
774 `---X--'
775-----------------------------------------------------------------------
776+
777Notice that since `M` is reachable from `R`, the edge from `N` to `M`
778was simplified away. However, `N` still appears in the history as an
779important commit because it "pulled" the change `R` into the main
780branch.
781
Junio C Hamanob73af6c2013-12-03 22:07:11782The `--simplify-by-decoration` option allows you to view only the
Junio C Hamano28363492008-11-14 08:26:31783big picture of the topology of the history, by omitting commits
784that are not referenced by tags. Commits are marked as !TREESAME
785(in other words, kept after history simplification rules described
786above) if (1) they are referenced by tags, or (2) they change the
787contents of the paths given on the command line. All other
788commits are marked as TREESAME (subject to be simplified away).
789
Junio C Hamano8ef91f32019-12-01 22:58:27790ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00791ifdef::git-rev-list[]
Junio C Hamanoa76cb0d2008-08-13 20:04:10792Bisection Helpers
793~~~~~~~~~~~~~~~~~
794
Junio C Hamanob0e02952008-01-19 08:02:00795--bisect::
Junio C Hamanob73af6c2013-12-03 22:07:11796Limit output to the one commit object which is roughly halfway between
797included and excluded commits. Note that the bad bisection ref
798`refs/bisect/bad` is added to the included commits (if it
799exists) and the good bisection refs `refs/bisect/good-*` are
800added to the excluded commits (if they exist). Thus, supposing there
801are no refs in `refs/bisect/`, if
802+
Junio C Hamanob0e02952008-01-19 08:02:00803-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57804$ git rev-list --bisect foo ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00805-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11806+
Junio C Hamanob0e02952008-01-19 08:02:00807outputs 'midpoint', the output of the two commands
Junio C Hamanob73af6c2013-12-03 22:07:11808+
Junio C Hamanob0e02952008-01-19 08:02:00809-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57810$ git rev-list foo ^midpoint
811$ git rev-list midpoint ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00812-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11813+
Junio C Hamanob0e02952008-01-19 08:02:00814would be of roughly the same length. Finding the change which
815introduces a regression is thus reduced to a binary search: repeatedly
816generate and test new 'midpoint's until the commit chain is of length
Junio C Hamano255163d2020-08-18 00:37:23817one.
Junio C Hamanob0e02952008-01-19 08:02:00818
819--bisect-vars::
Junio C Hamanob73af6c2013-12-03 22:07:11820This calculates the same as `--bisect`, except that refs in
821`refs/bisect/` are not used, and except that this outputs
822text ready to be eval'ed by the shell. These lines will assign the
823name of the midpoint revision to the variable `bisect_rev`, and the
824expected number of commits to be tested after `bisect_rev` is tested
825to `bisect_nr`, the expected number of commits to be tested if
826`bisect_rev` turns out to be good to `bisect_good`, the expected
827number of commits to be tested if `bisect_rev` turns out to be bad to
828`bisect_bad`, and the number of commits we are bisecting right now to
829`bisect_all`.
Junio C Hamanob0e02952008-01-19 08:02:00830
831--bisect-all::
Junio C Hamanob73af6c2013-12-03 22:07:11832This outputs all the commit objects between the included and excluded
833commits, ordered by their distance to the included and excluded
834commits. Refs in `refs/bisect/` are not used. The farthest
835from them is displayed first. (This is the only one displayed by
836`--bisect`.)
Junio C Hamano792c5a92009-03-08 08:45:13837+
Junio C Hamanob0e02952008-01-19 08:02:00838This is useful because it makes it easy to choose a good commit to
839test when you want to avoid to test some of them for some reason (they
840may not compile for example).
Junio C Hamano792c5a92009-03-08 08:45:13841+
Junio C Hamanob0e02952008-01-19 08:02:00842This option can be used along with `--bisect-vars`, in this case,
843after all the sorted commit objects, there will be the same text as if
844`--bisect-vars` had been used alone.
845endif::git-rev-list[]
Junio C Hamano8ef91f32019-12-01 22:58:27846endif::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00847
Junio C Hamano8ef91f32019-12-01 22:58:27848ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00849Commit Ordering
850~~~~~~~~~~~~~~~
851
852By default, the commits are shown in reverse chronological order.
853
Junio C Hamanob0e02952008-01-19 08:02:00854--date-order::
Junio C Hamanod0316112012-08-22 19:55:29855Show no parents before all of its children are shown, but
856otherwise show commits in the commit timestamp order.
Junio C Hamanob0e02952008-01-19 08:02:00857
Junio C Hamanoa1952302013-07-01 21:31:18858--author-date-order::
859Show no parents before all of its children are shown, but
860otherwise show commits in the author timestamp order.
861
Junio C Hamanod0316112012-08-22 19:55:29862--topo-order::
863Show no parents before all of its children are shown, and
864avoid showing commits on multiple lines of history
865intermixed.
866+
867For example, in a commit history like this:
868+
869----------------------------------------------------------------
870
871 ---1----2----4----7
872\ \
873 3----5----6----8---
874
875----------------------------------------------------------------
876+
877where the numbers denote the order of commit timestamps, `git
878rev-list` and friends with `--date-order` show the commits in the
879timestamp order: 8 7 6 5 4 3 2 1.
880+
881With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
8823 1); some older commits are shown before newer ones in order to
883avoid showing the commits from two parallel development track mixed
884together.
Junio C Hamanob0e02952008-01-19 08:02:00885
886--reverse::
Junio C Hamanof3ca7b82016-10-03 22:27:02887Output the commits chosen to be shown (see Commit Limiting
888section above) in reverse order. Cannot be combined with
889`--walk-reflogs`.
Junio C Hamano8ef91f32019-12-01 22:58:27890endif::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00891
Junio C Hamano8ef91f32019-12-01 22:58:27892ifndef::git-shortlog[]
Junio C Hamanob0e02952008-01-19 08:02:00893Object Traversal
894~~~~~~~~~~~~~~~~
895
Junio C Hamano076ffcc2013-02-06 05:13:21896These options are mostly targeted for packing of Git repositories.
Junio C Hamanob0e02952008-01-19 08:02:00897
Junio C Hamano6bb32e62015-02-17 22:11:26898ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00899--objects::
Junio C Hamanob0e02952008-01-19 08:02:00900Print the object IDs of any object referenced by the listed
Junio C Hamanob73af6c2013-12-03 22:07:11901commits. `--objects foo ^bar` thus means ``send me
Junio C Hamanob0e02952008-01-19 08:02:00902all object IDs which I need to download if I have the commit
Junio C Hamano3acb2e72023-04-04 23:19:06903object _bar_ but not _foo_''. See also `--object-names` below.
Junio C Hamanob0e02952008-01-19 08:02:00904
Junio C Hamano68e72b72017-12-28 23:20:52905--in-commit-order::
906Print tree and blob ids in order of the commits. The tree
907and blob ids are printed after they are first referenced
908by a commit.
909
Junio C Hamanob0e02952008-01-19 08:02:00910--objects-edge::
Junio C Hamanob73af6c2013-12-03 22:07:11911Similar to `--objects`, but also print the IDs of excluded
912commits prefixed with a ``-'' character. This is used by
Junio C Hamano629edff2015-01-12 23:46:02913linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Junio C Hamanob0e02952008-01-19 08:02:00914objects in deltified form based on objects contained in these
915excluded commits to reduce network traffic.
916
Junio C Hamano629edff2015-01-12 23:46:02917--objects-edge-aggressive::
918Similar to `--objects-edge`, but it tries harder to find excluded
919commits at the cost of increased time. This is used instead of
920`--objects-edge` to build ``thin'' packs for shallow repositories.
921
Junio C Hamano6bb32e62015-02-17 22:11:26922--indexed-objects::
923Pretend as if all trees and blobs used by the index are listed
924on the command line. Note that you probably want to use
925`--objects`, too.
926
Junio C Hamanob0e02952008-01-19 08:02:00927--unpacked::
Junio C Hamanob73af6c2013-12-03 22:07:11928Only useful with `--objects`; print the object IDs that are not
Junio C Hamanob0e02952008-01-19 08:02:00929in packs.
Junio C Hamano0f1291d2017-12-27 19:58:35930
Junio C Hamanoc9f11c22019-07-10 02:54:04931--object-names::
932Only useful with `--objects`; print the names of the object IDs
Junio C Hamano3acb2e72023-04-04 23:19:06933that are found. This is the default behavior. Note that the
934"name" of each object is ambiguous, and mostly intended as a
935hint for packing objects. In particular: no distinction is made between
936the names of tags, trees, and blobs; path names may be modified
937to remove newlines; and if an object would appear multiple times
938with different names, only one name is shown.
Junio C Hamanoc9f11c22019-07-10 02:54:04939
940--no-object-names::
941Only useful with `--objects`; does not print the names of the object
942IDs that are found. This inverts `--object-names`. This flag allows
943the output to be more easily parsed by commands such as
944linkgit:git-cat-file[1].
945
Junio C Hamano0f1291d2017-12-27 19:58:35946--filter=<filter-spec>::
947Only useful with one of the `--objects*`; omits objects (usually
948blobs) from the list of printed objects. The '<filter-spec>'
949may be one of the following:
950+
951The form '--filter=blob:none' omits all blobs.
952+
Junio C Hamanoa2c58052024-01-26 22:42:07953The form '--filter=blob:limit=<n>[kmg]' omits blobs of size at least n
954bytes or units. n may be zero. The suffixes k, m, and g can be used
955to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k'
956is the same as 'blob:limit=1024'.
Junio C Hamano0f1291d2017-12-27 19:58:35957+
Junio C Hamanobe601db2021-05-07 04:20:28958The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects
959which are not of the requested type.
960+
Junio C Hamano0f1291d2017-12-27 19:58:35961The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
962specification contained in the blob (or blob-expression) '<blob-ish>'
Junio C Hamano20cf4932021-07-28 21:02:52963to omit blobs that would not be required for a sparse checkout on
Junio C Hamano0f1291d2017-12-27 19:58:35964the requested refs.
965+
Junio C Hamano94d00a52018-10-30 07:34:40966The form '--filter=tree:<depth>' omits all blobs and trees whose depth
967from the root tree is >= <depth> (minimum depth if an object is located
Junio C Hamano2567b322019-02-05 23:33:56968at multiple depths in the commits traversed). <depth>=0 will not include
969any trees or blobs unless included explicitly in the command-line (or
970standard input when --stdin is used). <depth>=1 will include only the
971tree and blobs which are referenced directly by a commit reachable from
972<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
973while also including trees and blobs one more level removed from an
974explicitly-given commit or tree.
Junio C Hamano0887d042019-06-03 19:55:17975+
976Note that the form '--filter=sparse:path=<path>' that wants to read
977from an arbitrary path on the filesystem has been dropped for security
978reasons.
Junio C Hamanocb705392019-09-18 19:30:01979+
980Multiple '--filter=' flags can be specified to combine filters. Only
981objects which are accepted by every filter are included.
982+
983The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
984used to combined several filters, but this is harder than just repeating
985the '--filter' flag and is usually not necessary. Filters are joined by
986'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
987Besides the '{plus}' and '%' characters, the following characters are
988reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+&#39;&#96;+
989as well as all characters with ASCII code &lt;= `0x20`, which includes
990space and newline.
991+
992Other arbitrary characters can also be encoded. For instance,
993'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
994equivalent.
Junio C Hamano0f1291d2017-12-27 19:58:35995
996--no-filter::
997Turn off any previous `--filter=` argument.
998
Junio C Hamanobe601db2021-05-07 04:20:28999--filter-provided-objects::
1000Filter the list of explicitly provided objects, which would otherwise
1001always be printed even if they did not match any of the filters. Only
1002useful with `--filter=`.
1003
Junio C Hamano0f1291d2017-12-27 19:58:351004--filter-print-omitted::
1005Only useful with `--filter=`; prints a list of the objects omitted
Junio C Hamano6b7d2152019-04-16 12:51:151006by the filter. Object IDs are prefixed with a ``~'' character.
Junio C Hamano0f1291d2017-12-27 19:58:351007
1008--missing=<missing-action>::
1009A debug option to help with future "partial clone" development.
1010This option specifies how missing objects are handled.
1011+
1012The form '--missing=error' requests that rev-list stop with an error if
1013a missing object is encountered. This is the default action.
1014+
1015The form '--missing=allow-any' will allow object traversal to continue
1016if a missing object is encountered. Missing objects will silently be
1017omitted from the results.
1018+
Junio C Hamano640779d2018-02-14 01:29:141019The form '--missing=allow-promisor' is like 'allow-any', but will only
1020allow object traversal to continue for EXPECTED promisor missing objects.
1021Unexpected missing objects will raise an error.
1022+
Junio C Hamano0f1291d2017-12-27 19:58:351023The form '--missing=print' is like 'allow-any', but will also print a
1024list of the missing objects. Object IDs are prefixed with a ``?'' character.
Junio C Hamanod2c69b62024-03-08 00:03:231025+
1026If some tips passed to the traversal are missing, they will be
1027considered as missing too, and the traversal will ignore them. In case
1028we cannot get their Object ID though, an error will be raised.
Junio C Hamanob0e02952008-01-19 08:02:001029
Junio C Hamano640779d2018-02-14 01:29:141030--exclude-promisor-objects::
1031(For internal use only.) Prefilter object traversal at
1032promisor boundary. This is used with partial clone. This is
1033stronger than `--missing=allow-promisor` because it limits the
1034traversal, rather than just silencing errors about missing
1035objects.
Junio C Hamano46fbbcb2018-11-07 03:54:161036endif::git-rev-list[]
Junio C Hamano640779d2018-02-14 01:29:141037
Junio C Hamanoeccdd4a2012-09-10 23:28:171038--no-walk[=(sorted|unsorted)]::
Junio C Hamanoeccdd4a2012-09-10 23:28:171039Only show the given commits, but do not traverse their ancestors.
1040This has no effect if a range is specified. If the argument
Junio C Hamanob73af6c2013-12-03 22:07:111041`unsorted` is given, the commits are shown in the order they were
1042given on the command line. Otherwise (if `sorted` or no argument
1043was given), the commits are shown in reverse chronological order
Junio C Hamanoeccdd4a2012-09-10 23:28:171044by commit time.
Junio C Hamanoe8fdbbb2021-11-12 23:42:031045Cannot be combined with `--graph`.
Junio C Hamanob0e02952008-01-19 08:02:001046
1047--do-walk::
Junio C Hamanob73af6c2013-12-03 22:07:111048Overrides a previous `--no-walk`.
Junio C Hamano8ef91f32019-12-01 22:58:271049endif::git-shortlog[]
Junio C Hamanod2c978f2011-03-20 19:42:221050
Junio C Hamano8ef91f32019-12-01 22:58:271051ifndef::git-shortlog[]
Junio C Hamanod2c978f2011-03-20 19:42:221052Commit Formatting
1053~~~~~~~~~~~~~~~~~
1054
1055ifdef::git-rev-list[]
1056Using these options, linkgit:git-rev-list[1] will act similar to the
1057more specialized family of commit log tools: linkgit:git-log[1],
1058linkgit:git-show[1], and linkgit:git-whatchanged[1]
1059endif::git-rev-list[]
1060
1061include::pretty-options.txt[]
1062
1063--relative-date::
Junio C Hamanod2c978f2011-03-20 19:42:221064Synonym for `--date=relative`.
1065
Junio C Hamano1eb56092015-10-05 20:39:531066--date=<format>::
Junio C Hamanod2c978f2011-03-20 19:42:221067Only takes effect for dates shown in human-readable format, such
Junio C Hamanob73af6c2013-12-03 22:07:111068as when using `--pretty`. `log.date` config variable sets a default
Junio C Hamano1eb56092015-10-05 20:39:531069value for the log command's `--date` option. By default, dates
1070are shown in the original time zone (either committer's or
1071author's). If `-local` is appended to the format (e.g.,
1072`iso-local`), the user's local time zone is used instead.
Junio C Hamanod2c978f2011-03-20 19:42:221073+
Junio C Hamanob5513772019-04-22 03:38:391074--
Junio C Hamanod2c978f2011-03-20 19:42:221075`--date=relative` shows dates relative to the current time,
Junio C Hamanoe548d1b2016-08-08 22:26:491076e.g. ``2 hours ago''. The `-local` option has no effect for
1077`--date=relative`.
Junio C Hamanob5513772019-04-22 03:38:391078
Junio C Hamano1eb56092015-10-05 20:39:531079`--date=local` is an alias for `--date=default-local`.
Junio C Hamanob5513772019-04-22 03:38:391080
Junio C Hamanoac12f0e2014-09-19 22:32:511081`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
1082The differences to the strict ISO 8601 format are:
1083
1084- a space instead of the `T` date/time delimiter
1085- a space between time and time zone
1086- no colon between hours and minutes of the time zone
1087
Junio C Hamanoac12f0e2014-09-19 22:32:511088`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
1089ISO 8601 format.
Junio C Hamanob5513772019-04-22 03:38:391090
Junio C Hamanod2c978f2011-03-20 19:42:221091`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Junio C Hamanob73af6c2013-12-03 22:07:111092format, often found in email messages.
Junio C Hamanob5513772019-04-22 03:38:391093
Junio C Hamanob73af6c2013-12-03 22:07:111094`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Junio C Hamanob5513772019-04-22 03:38:391095
Junio C Hamanoe548d1b2016-08-08 22:26:491096`--date=raw` shows the date as seconds since the epoch (1970-01-01
109700:00:00 UTC), followed by a space, and then the timezone as an offset
1098from UTC (a `+` or `-` with four digits; the first two are hours, and
1099the second two are minutes). I.e., as if the timestamp were formatted
1100with `strftime("%s %z")`).
1101Note that the `-local` option does not affect the seconds-since-epoch
1102value (which is always measured in UTC), but does switch the accompanying
1103timezone value.
Junio C Hamanob5513772019-04-22 03:38:391104
Junio C Hamano23168ef2019-02-07 07:20:471105`--date=human` shows the timezone if the timezone does not match the
1106current time-zone, and doesn't print the whole date if that matches
1107(ie skip printing year for dates that are "this year", but also skip
1108the whole date itself if it's in the last few days and we can just say
1109what weekday it was). For older dates the hour and minute is also
1110omitted.
Junio C Hamanob5513772019-04-22 03:38:391111
Junio C Hamanoe548d1b2016-08-08 22:26:491112`--date=unix` shows the date as a Unix epoch timestamp (seconds since
11131970). As with `--raw`, this is always in UTC and therefore `-local`
1114has no effect.
Junio C Hamanob5513772019-04-22 03:38:391115
Junio C Hamano55d91912017-06-22 22:32:461116`--date=format:...` feeds the format `...` to your system `strftime`,
Junio C Hamano59a32b02021-12-10 22:53:381117except for %s, %z, and %Z, which are handled internally.
Junio C Hamanod7ed4042015-08-03 19:43:001118Use `--date=format:%c` to show the date in your system locale's
1119preferred format. See the `strftime` manual for a complete list of
Junio C Hamano1eb56092015-10-05 20:39:531120format placeholders. When using `-local`, the correct syntax is
1121`--date=format-local:...`.
Junio C Hamanob5513772019-04-22 03:38:391122
Junio C Hamano613334c2023-02-24 19:54:381123`--date=default` is the default format, and is based on ctime(3)
1124output. It shows a single line with three-letter day of the week,
1125three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS"
1126format, followed by 4-digit year, plus timezone information, unless
1127the local time zone is used, e.g. `Thu Jan 1 00:00:00 1970 +0000`.
Junio C Hamanob5513772019-04-22 03:38:391128--
Junio C Hamanod2c978f2011-03-20 19:42:221129
1130ifdef::git-rev-list[]
1131--header::
Junio C Hamanod2c978f2011-03-20 19:42:221132Print the contents of the commit in raw-format; each record is
1133separated with a NUL character.
Junio C Hamano20cf4932021-07-28 21:02:521134
1135--no-commit-header::
1136Suppress the header line containing "commit" and the object ID printed before
1137the specified format. This has no effect on the built-in formats; only custom
1138formats are affected.
1139
1140--commit-header::
1141Overrides a previous `--no-commit-header`.
Junio C Hamanod2c978f2011-03-20 19:42:221142endif::git-rev-list[]
1143
1144--parents::
Junio C Hamanod2c978f2011-03-20 19:42:221145Print also the parents of the commit (in the form "commit parent...").
Junio C Hamanoce019c02017-10-30 05:57:461146Also enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221147
1148--children::
Junio C Hamanod2c978f2011-03-20 19:42:221149Print also the children of the commit (in the form "commit child...").
Junio C Hamanoce019c02017-10-30 05:57:461150Also enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221151
1152ifdef::git-rev-list[]
1153--timestamp::
1154Print the raw commit timestamp.
1155endif::git-rev-list[]
1156
1157--left-right::
Junio C Hamanocd451662016-09-13 00:54:091158Mark which side of a symmetric difference a commit is reachable from.
Junio C Hamanod2c978f2011-03-20 19:42:221159Commits from the left side are prefixed with `<` and those from
1160the right with `>`. If combined with `--boundary`, those
1161commits are prefixed with `-`.
1162+
1163For example, if you have this topology:
1164+
1165-----------------------------------------------------------------------
1166 y---b---b branch B
1167 / \ /
1168 / .
1169 / / \
1170 o---x---a---a branch A
1171-----------------------------------------------------------------------
1172+
1173you would get an output like this:
1174+
1175-----------------------------------------------------------------------
1176$ git rev-list --left-right --boundary --pretty=oneline A...B
1177
1178>bbbbbbb... 3rd on b
1179>bbbbbbb... 2nd on b
1180<aaaaaaa... 3rd on a
1181<aaaaaaa... 2nd on a
1182-yyyyyyy... 1st on b
1183-xxxxxxx... 1st on a
1184-----------------------------------------------------------------------
1185
1186--graph::
Junio C Hamanod2c978f2011-03-20 19:42:221187Draw a text-based graphical representation of the commit history
1188on the left hand side of the output. This may cause extra lines
1189to be printed in between commits, in order for the graph history
1190to be drawn properly.
Junio C Hamanoef57d1e2015-03-25 21:23:001191Cannot be combined with `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:221192+
Junio C Hamanoce019c02017-10-30 05:57:461193This enables parent rewriting, see 'History Simplification' above.
Junio C Hamanod2c978f2011-03-20 19:42:221194+
Junio C Hamanob73af6c2013-12-03 22:07:111195This implies the `--topo-order` option by default, but the
1196`--date-order` option may also be specified.
Junio C Hamanod2c978f2011-03-20 19:42:221197
Junio C Hamano624dd4c2014-04-03 21:56:301198--show-linear-break[=<barrier>]::
1199When --graph is not used, all history branches are flattened
1200which can make it hard to see that the two consecutive commits
1201do not belong to a linear branch. This option puts a barrier
1202in between them in that case. If `<barrier>` is specified, it
1203is the string that will be shown instead of the default one.
1204
Junio C Hamanod2c978f2011-03-20 19:42:221205ifdef::git-rev-list[]
1206--count::
1207Print a number stating how many commits would have been
1208listed, and suppress all other output. When used together
Junio C Hamanob73af6c2013-12-03 22:07:111209with `--left-right`, instead print the counts for left and
Junio C Hamanob77f8192011-05-05 01:30:381210right commits, separated by a tab. When used together with
Junio C Hamanob73af6c2013-12-03 22:07:111211`--cherry-mark`, omit patch equivalent commits from these
Junio C Hamanob77f8192011-05-05 01:30:381212counts and print the count for equivalent commits separated
1213by a tab.
Junio C Hamanod2c978f2011-03-20 19:42:221214endif::git-rev-list[]
Junio C Hamano8ef91f32019-12-01 22:58:271215endif::git-shortlog[]