blob: f1c52208f08c3dc9f50e8d18f546a96276a47fec [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
16--
17
Junio C Hamano693e7092012-09-12 22:56:5318-<number>::
19-n <number>::
Junio C Hamanob4a9ede2009-04-08 07:36:3220--max-count=<number>::
Junio C Hamanoc5be4cc2011-03-09 07:20:4321Limit the number of commits to output.
Junio C Hamanob0e02952008-01-19 08:02:0022
Junio C Hamanob4a9ede2009-04-08 07:36:3223--skip=<number>::
Junio C Hamanob0e02952008-01-19 08:02:0024Skip 'number' commits before starting to show the commit output.
25
Junio C Hamanob4a9ede2009-04-08 07:36:3226--since=<date>::
27--after=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0028Show commits more recent than a specific date.
29
Junio C Hamanob4a9ede2009-04-08 07:36:3230--until=<date>::
31--before=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0032Show commits older than a specific date.
33
Junio C Hamano4f1d8c42008-03-03 02:01:1634ifdef::git-rev-list[]
Junio C Hamanob4a9ede2009-04-08 07:36:3235--max-age=<timestamp>::
36--min-age=<timestamp>::
Junio C Hamanob0e02952008-01-19 08:02:0037Limit the commits output to specified time range.
Junio C Hamano4f1d8c42008-03-03 02:01:1638endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0039
Junio C Hamanob4a9ede2009-04-08 07:36:3240--author=<pattern>::
41--committer=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0042Limit the commits output to ones with author/committer
Junio C Hamano8ce35d72012-09-18 22:30:4243header lines that match the specified pattern (regular
44expression). With more than one `--author=<pattern>`,
45commits whose author matches any of the given patterns are
46chosen (similarly for multiple `--committer=<pattern>`).
Junio C Hamanob0e02952008-01-19 08:02:0047
Junio C Hamano9954ed72012-10-03 04:54:0048--grep-reflog=<pattern>::
Junio C Hamano9954ed72012-10-03 04:54:0049Limit the commits output to ones with reflog entries that
50match the specified pattern (regular expression). With
51more than one `--grep-reflog`, commits whose reflog message
52matches any of the given patterns are chosen. It is an
53error to use this option unless `--walk-reflogs` is in use.
54
Junio C Hamanob4a9ede2009-04-08 07:36:3255--grep=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0056Limit the commits output to ones with log message that
Junio C Hamano8ce35d72012-09-18 22:30:4257matches the specified pattern (regular expression). With
58more than one `--grep=<pattern>`, commits whose message
59matches any of the given patterns are chosen (but see
60`--all-match`).
Junio C Hamano3891e252015-08-31 23:06:1361ifndef::git-rev-list[]
Junio C Hamano9954ed72012-10-03 04:54:0062+
Junio C Hamano8152abf2015-04-28 22:48:0263When `--show-notes` is in effect, the message from the notes is
64matched as if it were part of the log message.
Junio C Hamano3891e252015-08-31 23:06:1365endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0066
Junio C Hamanoaa17c7c2008-11-03 04:36:5867--all-match::
Junio C Hamanob73af6c2013-12-03 22:07:1168Limit the commits output to ones that match all given `--grep`,
Junio C Hamano8ce35d72012-09-18 22:30:4269instead of ones that match at least one.
Junio C Hamanoaa17c7c2008-11-03 04:36:5870
Junio C Hamano6bb32e62015-02-17 22:11:2671--invert-grep::
72Limit the commits output to ones with log message that do not
73match the pattern specified with `--grep=<pattern>`.
74
Junio C Hamanoeb415992008-06-08 22:49:4775-i::
76--regexp-ignore-case::
Junio C Hamanob73af6c2013-12-03 22:07:1177Match the regular expression limiting patterns without regard to letter
78case.
Junio C Hamanob0e02952008-01-19 08:02:0079
Junio C Hamanoa1295452012-11-13 22:32:0480--basic-regexp::
Junio C Hamanoa1295452012-11-13 22:32:0481Consider the limiting patterns to be basic regular expressions;
82this is the default.
83
Junio C Hamanoeb415992008-06-08 22:49:4784-E::
85--extended-regexp::
Junio C Hamanob0e02952008-01-19 08:02:0086Consider the limiting patterns to be extended regular expressions
87instead of the default basic regular expressions.
88
Junio C Hamanoeb415992008-06-08 22:49:4789-F::
90--fixed-strings::
Junio C Hamano24bc09a2008-02-28 00:27:4491Consider the limiting patterns to be fixed strings (don't interpret
92pattern as a regular expression).
93
Junio C Hamanoa1295452012-11-13 22:32:0494--perl-regexp::
Junio C Hamanob73af6c2013-12-03 22:07:1195Consider the limiting patterns to be Perl-compatible regular expressions.
Junio C Hamanoa1295452012-11-13 22:32:0496Requires libpcre to be compiled in.
97
Junio C Hamanob0e02952008-01-19 08:02:0098--remove-empty::
Junio C Hamanob0e02952008-01-19 08:02:0099Stop when a given path disappears from the tree.
100
Junio C Hamano934e1782009-07-16 06:59:15101--merges::
Junio C Hamanof32ce262011-03-27 07:35:11102Print only merge commits. This is exactly the same as `--min-parents=2`.
Junio C Hamano934e1782009-07-16 06:59:15103
Junio C Hamanob0e02952008-01-19 08:02:00104--no-merges::
Junio C Hamanof32ce262011-03-27 07:35:11105Do not print commits with more than one parent. This is
106exactly the same as `--max-parents=1`.
107
108--min-parents=<number>::
109--max-parents=<number>::
110--no-min-parents::
111--no-max-parents::
Junio C Hamanoc5bb3b32013-08-05 22:43:36112Show only commits which have at least (or at most) that many parent
Junio C Hamanof32ce262011-03-27 07:35:11113commits. In particular, `--max-parents=1` is the same as `--no-merges`,
114`--min-parents=2` is the same as `--merges`. `--max-parents=0`
115gives all root commits and `--min-parents=3` all octopus merges.
116+
117`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
118again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
119parents) and `--max-parents=-1` (negative numbers denote no upper limit).
Junio C Hamanob0e02952008-01-19 08:02:00120
121--first-parent::
122Follow only the first parent commit upon seeing a merge
123commit. This option can give a better overview when
124viewing the evolution of a particular topic branch,
125because merges into a topic branch tend to be only about
126adjusting to updated upstream from time to time, and
127this option allows you to ignore the individual commits
Junio C Hamanoef57d1e2015-03-25 21:23:00128brought in to your history by such a merge. Cannot be
129combined with --bisect.
Junio C Hamanob0e02952008-01-19 08:02:00130
131--not::
Junio C Hamanob0e02952008-01-19 08:02:00132Reverses the meaning of the '{caret}' prefix (or lack thereof)
Junio C Hamanob73af6c2013-12-03 22:07:11133for all following revision specifiers, up to the next `--not`.
Junio C Hamanob0e02952008-01-19 08:02:00134
135--all::
Junio C Hamano4fdccb22010-02-19 09:58:14136Pretend as if all the refs in `refs/` are listed on the
Junio C Hamanob0e02952008-01-19 08:02:00137command line as '<commit>'.
138
Junio C Hamanod2179ef2010-10-22 04:12:17139--branches[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14140Pretend as if all the refs in `refs/heads` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17141on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano57827fb2010-01-23 03:02:50142branches to ones matching given shell glob. If pattern lacks '?',
Junio C Hamano81d540a2012-03-02 19:52:47143'{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56144
Junio C Hamanod2179ef2010-10-22 04:12:17145--tags[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14146Pretend as if all the refs in `refs/tags` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17147on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano81d540a2012-03-02 19:52:47148tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
149or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56150
Junio C Hamanod2179ef2010-10-22 04:12:17151--remotes[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14152Pretend as if all the refs in `refs/remotes` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17153on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano97bcb482010-11-25 03:16:07154remote-tracking branches to ones matching given shell glob.
Junio C Hamano81d540a2012-03-02 19:52:47155If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50156
Junio C Hamanod2179ef2010-10-22 04:12:17157--glob=<glob-pattern>::
158Pretend as if all the refs matching shell glob '<glob-pattern>'
Junio C Hamano57827fb2010-01-23 03:02:50159are listed on the command line as '<commit>'. Leading 'refs/',
Junio C Hamano81d540a2012-03-02 19:52:47160is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
161or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50162
Junio C Hamanof079f702013-12-06 23:43:18163--exclude=<glob-pattern>::
164
165Do not include refs matching '<glob-pattern>' that the next `--all`,
166`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
167consider. Repetitions of this option accumulate exclusion patterns
168up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
169`--glob` option (other options or arguments do not clear
Junio C Hamanofb5ffde2014-11-04 22:38:56170accumulated patterns).
Junio C Hamanof079f702013-12-06 23:43:18171+
172The patterns given should not begin with `refs/heads`, `refs/tags`, or
173`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
174respectively, and they must begin with `refs/` when applied to `--glob`
175or `--all`. If a trailing '/{asterisk}' is intended, it must be given
176explicitly.
177
Junio C Hamano2a4bcbc2014-10-29 20:07:39178--reflog::
179Pretend as if all objects mentioned by reflogs are listed on the
180command line as `<commit>`.
181
Junio C Hamano084228c2011-05-30 08:13:52182--ignore-missing::
Junio C Hamano084228c2011-05-30 08:13:52183Upon seeing an invalid object name in the input, pretend as if
184the bad input was not given.
Junio C Hamano50819852008-11-19 02:07:56185
Junio C Hamano5706e0b2009-11-24 10:54:16186ifndef::git-rev-list[]
187--bisect::
Junio C Hamano4fdccb22010-02-19 09:58:14188Pretend as if the bad bisection ref `refs/bisect/bad`
Junio C Hamano5706e0b2009-11-24 10:54:16189was listed and as if it was followed by `--not` and the good
Junio C Hamano4fdccb22010-02-19 09:58:14190bisection refs `refs/bisect/good-*` on the command
Junio C Hamanoef57d1e2015-03-25 21:23:00191line. Cannot be combined with --first-parent.
Junio C Hamano5706e0b2009-11-24 10:54:16192endif::git-rev-list[]
193
Junio C Hamanob0e02952008-01-19 08:02:00194--stdin::
Junio C Hamanob0e02952008-01-19 08:02:00195In addition to the '<commit>' listed on the command
Junio C Hamano5706e0b2009-11-24 10:54:16196line, read them from the standard input. If a '--' separator is
197seen, stop reading commits and start reading paths to limit the
198result.
Junio C Hamanob0e02952008-01-19 08:02:00199
Junio C Hamano5706e0b2009-11-24 10:54:16200ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00201--quiet::
Junio C Hamanob0e02952008-01-19 08:02:00202Don't print anything to standard output. This form
203is primarily meant to allow the caller to
204test the exit status to see if a range of objects is fully
205connected (or not). It is faster than redirecting stdout
Junio C Hamanob73af6c2013-12-03 22:07:11206to `/dev/null` as the output does not have to be formatted.
Junio C Hamano69cd7c52008-06-04 07:52:59207endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00208
Junio C Hamano9a2fb2d2011-03-23 05:40:15209--cherry-mark::
Junio C Hamano9a2fb2d2011-03-23 05:40:15210Like `--cherry-pick` (see below) but mark equivalent commits
211with `=` rather than omitting them, and inequivalent ones with `+`.
212
Junio C Hamanob0e02952008-01-19 08:02:00213--cherry-pick::
Junio C Hamanob0e02952008-01-19 08:02:00214Omit any commit that introduces the same change as
Junio C Hamanob73af6c2013-12-03 22:07:11215another commit on the ``other side'' when the set of
Junio C Hamanob0e02952008-01-19 08:02:00216commits are limited with symmetric difference.
217+
218For example, if you have two branches, `A` and `B`, a usual way
219to list all commits on only one side of them is with
Junio C Hamano5cd15182011-04-05 00:21:10220`--left-right` (see the example below in the description of
Junio C Hamanob73af6c2013-12-03 22:07:11221the `--left-right` option). However, it shows the commits that were
222cherry-picked from the other branch (for example, ``3rd on b'' may be
223cherry-picked from branch A). With this option, such pairs of commits are
Junio C Hamanob0e02952008-01-19 08:02:00224excluded from the output.
225
Junio C Hamano9a2fb2d2011-03-23 05:40:15226--left-only::
227--right-only::
Junio C Hamano9a2fb2d2011-03-23 05:40:15228List only commits on the respective side of a symmetric range,
229i.e. only those which would be marked `<` resp. `>` by
230`--left-right`.
231+
232For example, `--cherry-pick --right-only A...B` omits those
233commits from `B` which are in `A` or are patch-equivalent to a commit in
Junio C Hamanob76a6862012-05-02 22:02:46234`A`. In other words, this lists the `+` commits from `git cherry A B`.
Junio C Hamano9a2fb2d2011-03-23 05:40:15235More precisely, `--cherry-pick --right-only --no-merges` gives the exact
236list.
237
238--cherry::
Junio C Hamano9a2fb2d2011-03-23 05:40:15239A synonym for `--right-only --cherry-mark --no-merges`; useful to
240limit the output to the commits on our side and mark those that
241have been applied to the other side of a forked history with
242`git log --cherry upstream...mybranch`, similar to
243`git cherry upstream mybranch`.
244
Junio C Hamanoeb415992008-06-08 22:49:47245-g::
246--walk-reflogs::
Junio C Hamanob0e02952008-01-19 08:02:00247Instead of walking the commit ancestry chain, walk
248reflog entries from the most recent one to older ones.
249When this option is used you cannot specify commits to
250exclude (that is, '{caret}commit', 'commit1..commit2',
Junio C Hamanod75148a2014-04-08 19:48:38251and 'commit1\...commit2' notations cannot be used).
Junio C Hamanob0e02952008-01-19 08:02:00252+
Junio C Hamanob73af6c2013-12-03 22:07:11253With `--pretty` format other than `oneline` (for obvious reasons),
Junio C Hamanob0e02952008-01-19 08:02:00254this causes the output to have two extra lines of information
255taken from the reflog. By default, 'commit@\{Nth}' notation is
256used in the output. When the starting commit is specified as
Junio C Hamano1d368882008-08-11 22:03:10257'commit@\{now}', output also uses 'commit@\{timestamp}' notation
Junio C Hamanob73af6c2013-12-03 22:07:11258instead. Under `--pretty=oneline`, the commit message is
Junio C Hamanob0e02952008-01-19 08:02:00259prefixed with this information on the same line.
Junio C Hamanob73af6c2013-12-03 22:07:11260This option cannot be combined with `--reverse`.
Junio C Hamanob0e02952008-01-19 08:02:00261See also linkgit:git-reflog[1].
262
263--merge::
Junio C Hamanob0e02952008-01-19 08:02:00264After a failed merge, show refs that touch files having a
265conflict and don't exist on all heads to merge.
266
267--boundary::
Junio C Hamano27159f82013-06-14 17:19:22268Output excluded boundary commits. Boundary commits are
269prefixed with `-`.
Junio C Hamanob0e02952008-01-19 08:02:00270
Junio C Hamano5b3533d2014-02-27 23:07:15271ifdef::git-rev-list[]
272--use-bitmap-index::
273
274Try to speed up the traversal using the pack bitmap index (if
275one is available). Note that when traversing with `--objects`,
276trees and blobs will not have their associated path printed.
277endif::git-rev-list[]
278
Junio C Hamanoa76cb0d2008-08-13 20:04:10279--
280
281History Simplification
282~~~~~~~~~~~~~~~~~~~~~~
283
Junio C Hamano28363492008-11-14 08:26:31284Sometimes you are only interested in parts of the history, for example the
285commits modifying a particular <path>. But there are two parts of
286'History Simplification', one part is selecting the commits and the other
287is how to do it, as there are various strategies to simplify the history.
288
289The following options select the commits to be shown:
290
291<paths>::
Junio C Hamano28363492008-11-14 08:26:31292Commits modifying the given <paths> are selected.
293
294--simplify-by-decoration::
Junio C Hamano28363492008-11-14 08:26:31295Commits that are referred by some branch or tag are selected.
296
297Note that extra commits can be shown to give a meaningful history.
298
299The following options affect the way the simplification is performed:
300
301Default mode::
Junio C Hamano28363492008-11-14 08:26:31302Simplifies the history to the simplest history explaining the
303final state of the tree. Simplest because it prunes some side
304branches if the end result is the same (i.e. merging branches
305with the same content)
306
307--full-history::
Junio C Hamano15567bc2011-07-23 00:51:59308Same as the default mode, but does not prune some history.
Junio C Hamano28363492008-11-14 08:26:31309
310--dense::
Junio C Hamano28363492008-11-14 08:26:31311Only the selected commits are shown, plus some to have a
312meaningful history.
313
314--sparse::
Junio C Hamano28363492008-11-14 08:26:31315All commits in the simplified history are shown.
316
317--simplify-merges::
Junio C Hamanob73af6c2013-12-03 22:07:11318Additional option to `--full-history` to remove some needless
Junio C Hamano28363492008-11-14 08:26:31319merges from the resulting history, as there are no selected
320commits contributing to this merge.
321
Junio C Hamano89a57342010-06-22 23:22:55322--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55323When given a range of commits to display (e.g. 'commit1..commit2'
324or 'commit2 {caret}commit1'), only display commits that exist
325directly on the ancestry chain between the 'commit1' and
326'commit2', i.e. commits that are both descendants of 'commit1',
327and ancestors of 'commit2'.
328
Junio C Hamano28363492008-11-14 08:26:31329A more detailed explanation follows.
Junio C Hamanoa76cb0d2008-08-13 20:04:10330
331Suppose you specified `foo` as the <paths>. We shall call commits
332that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
333filtered for `foo`, they look different and equal, respectively.)
334
335In the following, we will always refer to the same example history to
336illustrate the differences between simplification settings. We assume
337that you are filtering for a file `foo` in this commit graph:
338-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22339 .-A---M---N---O---P---Q
340 / / / / / /
341I B C D E Y
342 \ / / / / /
343 `-------------' X
Junio C Hamanoa76cb0d2008-08-13 20:04:10344-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22345The horizontal line of history A---Q is taken to be the first parent of
Junio C Hamanoa76cb0d2008-08-13 20:04:10346each merge. The commits are:
347
348* `I` is the initial commit, in which `foo` exists with contents
Junio C Hamanob73af6c2013-12-03 22:07:11349 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Junio C Hamanoa76cb0d2008-08-13 20:04:10350 commits are compared to an empty tree, so `I` is !TREESAME.
351
Junio C Hamanob73af6c2013-12-03 22:07:11352* In `A`, `foo` contains just ``foo''.
Junio C Hamanoa76cb0d2008-08-13 20:04:10353
354* `B` contains the same change as `A`. Its merge `M` is trivial and
355 hence TREESAME to all parents.
356
Junio C Hamanob73af6c2013-12-03 22:07:11357* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Junio C Hamanoa76cb0d2008-08-13 20:04:10358 so it is not TREESAME to any parent.
359
Junio C Hamanob73af6c2013-12-03 22:07:11360* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
361 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
Junio C Hamanoa76cb0d2008-08-13 20:04:10362
Junio C Hamanob73af6c2013-12-03 22:07:11363* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
364 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
Junio C Hamano27159f82013-06-14 17:19:22365
Junio C Hamanod7fccbf2013-07-25 03:24:57366* `X` is an independent root commit that added a new file `side`, and `Y`
Junio C Hamano27159f82013-06-14 17:19:22367 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
368 `Q` is TREESAME to `P`, but not to `Y`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10369
Junio C Hamanob73af6c2013-12-03 22:07:11370`rev-list` walks backwards through history, including or excluding
371commits based on whether `--full-history` and/or parent rewriting
372(via `--parents` or `--children`) are used. The following settings
Junio C Hamanoa76cb0d2008-08-13 20:04:10373are available.
374
375Default mode::
Junio C Hamanoa76cb0d2008-08-13 20:04:10376Commits are included if they are not TREESAME to any parent
Junio C Hamanob73af6c2013-12-03 22:07:11377(though this can be changed, see `--sparse` below). If the
Junio C Hamanoa76cb0d2008-08-13 20:04:10378commit was a merge, and it was TREESAME to one parent, follow
379only that parent. (Even if there are several TREESAME
380parents, follow only one of them.) Otherwise, follow all
381parents.
382+
383This results in:
384+
385-----------------------------------------------------------------------
386 .-A---N---O
Junio C Hamano89a57342010-06-22 23:22:55387 / / /
Junio C Hamanoa76cb0d2008-08-13 20:04:10388I---------D
389-----------------------------------------------------------------------
390+
391Note how the rule to only follow the TREESAME parent, if one is
392available, removed `B` from consideration entirely. `C` was
393considered via `N`, but is TREESAME. Root commits are compared to an
394empty tree, so `I` is !TREESAME.
395+
Junio C Hamanob73af6c2013-12-03 22:07:11396Parent/child relations are only visible with `--parents`, but that does
Junio C Hamanoa76cb0d2008-08-13 20:04:10397not affect the commits selected in default mode, so we have shown the
398parent lines.
399
400--full-history without parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10401This mode differs from the default in one point: always follow
402all parents of a merge, even if it is TREESAME to one of them.
403Even if more than one side of the merge has commits that are
404included, this does not imply that the merge itself is! In
405the example, we get
406+
407-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22408I A B N D O P Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10409-----------------------------------------------------------------------
410+
Junio C Hamano27159f82013-06-14 17:19:22411`M` was excluded because it is TREESAME to both parents. `E`,
Junio C Hamanoa76cb0d2008-08-13 20:04:10412`C` and `B` were all walked, but only `B` was !TREESAME, so the others
413do not appear.
414+
415Note that without parent rewriting, it is not really possible to talk
416about the parent/child relationships between the commits, so we show
417them disconnected.
418
419--full-history with parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10420Ordinary commits are only included if they are !TREESAME
Junio C Hamanob73af6c2013-12-03 22:07:11421(though this can be changed, see `--sparse` below).
Junio C Hamanoa76cb0d2008-08-13 20:04:10422+
423Merges are always included. However, their parent list is rewritten:
424Along each parent, prune away commits that are not included
425themselves. This results in
426+
427-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22428 .-A---M---N---O---P---Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10429 / / / / /
430I B / D /
431 \ / / / /
432 `-------------'
433-----------------------------------------------------------------------
434+
Junio C Hamanob73af6c2013-12-03 22:07:11435Compare to `--full-history` without rewriting above. Note that `E`
Junio C Hamanoa76cb0d2008-08-13 20:04:10436was pruned away because it is TREESAME, but the parent list of P was
437rewritten to contain `E`'s parent `I`. The same happened for `C` and
Junio C Hamano27159f82013-06-14 17:19:22438`N`, and `X`, `Y` and `Q`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10439
440In addition to the above settings, you can change whether TREESAME
441affects inclusion:
442
Junio C Hamanoeb415992008-06-08 22:49:47443--dense::
Junio C Hamanoa76cb0d2008-08-13 20:04:10444Commits that are walked are included if they are not TREESAME
445to any parent.
446
Junio C Hamanoeb415992008-06-08 22:49:47447--sparse::
Junio C Hamanoa76cb0d2008-08-13 20:04:10448All commits that are walked are included.
449+
Junio C Hamanob73af6c2013-12-03 22:07:11450Note that without `--full-history`, this still simplifies merges: if
Junio C Hamanoa76cb0d2008-08-13 20:04:10451one of the parents is TREESAME, we follow only that one, so the other
452sides of the merge are never walked.
Junio C Hamanob0e02952008-01-19 08:02:00453
Junio C Hamanoa2f46622008-09-03 05:20:31454--simplify-merges::
Junio C Hamanoa2f46622008-09-03 05:20:31455First, build a history graph in the same way that
Junio C Hamanob73af6c2013-12-03 22:07:11456`--full-history` with parent rewriting does (see above).
Junio C Hamanoa2f46622008-09-03 05:20:31457+
458Then simplify each commit `C` to its replacement `C'` in the final
459history according to the following rules:
460+
461--
462* Set `C'` to `C`.
463+
464* Replace each parent `P` of `C'` with its simplification `P'`. In
Junio C Hamano27159f82013-06-14 17:19:22465 the process, drop parents that are ancestors of other parents or that are
466 root commits TREESAME to an empty tree, and remove duplicates, but take care
467 to never drop all parents that we are TREESAME to.
Junio C Hamanoa2f46622008-09-03 05:20:31468+
469* If after this parent rewriting, `C'` is a root or merge commit (has
470 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
471 Otherwise, it is replaced with its only parent.
472--
473+
474The effect of this is best shown by way of comparing to
Junio C Hamanob73af6c2013-12-03 22:07:11475`--full-history` with parent rewriting. The example turns into:
Junio C Hamanoa2f46622008-09-03 05:20:31476+
477-----------------------------------------------------------------------
478 .-A---M---N---O
479 / / /
480I B D
481 \ / /
482 `---------'
483-----------------------------------------------------------------------
484+
Junio C Hamanob73af6c2013-12-03 22:07:11485Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Junio C Hamanoa2f46622008-09-03 05:20:31486+
487--
488* `N`'s parent list had `I` removed, because it is an ancestor of the
489 other parent `M`. Still, `N` remained because it is !TREESAME.
490+
491* `P`'s parent list similarly had `I` removed. `P` was then
492 removed completely, because it had one parent and is TREESAME.
Junio C Hamano27159f82013-06-14 17:19:22493+
494* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
495 was a TREESAME root. `Q` was then removed completely, because it had one
496 parent and is TREESAME.
Junio C Hamanoa2f46622008-09-03 05:20:31497--
Junio C Hamanob0e02952008-01-19 08:02:00498
Junio C Hamano89a57342010-06-22 23:22:55499Finally, there is a fifth simplification mode available:
500
501--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55502Limit the displayed commits to those directly on the ancestry
Junio C Hamanob73af6c2013-12-03 22:07:11503chain between the ``from'' and ``to'' commits in the given commit
504range. I.e. only display commits that are ancestor of the ``to''
505commit and descendants of the ``from'' commit.
Junio C Hamano89a57342010-06-22 23:22:55506+
507As an example use case, consider the following commit history:
508+
509-----------------------------------------------------------------------
510 D---E-------F
511 / \ \
512 B---C---G---H---I---J
513 / \
514A-------K---------------L--M
515-----------------------------------------------------------------------
516+
517A regular 'D..M' computes the set of commits that are ancestors of `M`,
518but excludes the ones that are ancestors of `D`. This is useful to see
519what happened to the history leading to `M` since `D`, in the sense
Junio C Hamanob73af6c2013-12-03 22:07:11520that ``what does `M` have that did not exist in `D`''. The result in this
Junio C Hamano89a57342010-06-22 23:22:55521example would be all the commits, except `A` and `B` (and `D` itself,
522of course).
523+
524When we want to find out what commits in `M` are contaminated with the
525bug introduced by `D` and need fixing, however, we might want to view
526only the subset of 'D..M' that are actually descendants of `D`, i.e.
Junio C Hamanob73af6c2013-12-03 22:07:11527excluding `C` and `K`. This is exactly what the `--ancestry-path`
Junio C Hamano89a57342010-06-22 23:22:55528option does. Applied to the 'D..M' range, it results in:
529+
530-----------------------------------------------------------------------
531E-------F
532 \ \
533 G---H---I---J
534 \
535L--M
536-----------------------------------------------------------------------
537
Junio C Hamanob73af6c2013-12-03 22:07:11538The `--simplify-by-decoration` option allows you to view only the
Junio C Hamano28363492008-11-14 08:26:31539big picture of the topology of the history, by omitting commits
540that are not referenced by tags. Commits are marked as !TREESAME
541(in other words, kept after history simplification rules described
542above) if (1) they are referenced by tags, or (2) they change the
543contents of the paths given on the command line. All other
544commits are marked as TREESAME (subject to be simplified away).
545
Junio C Hamanob0e02952008-01-19 08:02:00546ifdef::git-rev-list[]
Junio C Hamanoa76cb0d2008-08-13 20:04:10547Bisection Helpers
548~~~~~~~~~~~~~~~~~
549
Junio C Hamanob0e02952008-01-19 08:02:00550--bisect::
Junio C Hamanob73af6c2013-12-03 22:07:11551Limit output to the one commit object which is roughly halfway between
552included and excluded commits. Note that the bad bisection ref
553`refs/bisect/bad` is added to the included commits (if it
554exists) and the good bisection refs `refs/bisect/good-*` are
555added to the excluded commits (if they exist). Thus, supposing there
556are no refs in `refs/bisect/`, if
557+
Junio C Hamanob0e02952008-01-19 08:02:00558-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57559$ git rev-list --bisect foo ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00560-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11561+
Junio C Hamanob0e02952008-01-19 08:02:00562outputs 'midpoint', the output of the two commands
Junio C Hamanob73af6c2013-12-03 22:07:11563+
Junio C Hamanob0e02952008-01-19 08:02:00564-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57565$ git rev-list foo ^midpoint
566$ git rev-list midpoint ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00567-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11568+
Junio C Hamanob0e02952008-01-19 08:02:00569would be of roughly the same length. Finding the change which
570introduces a regression is thus reduced to a binary search: repeatedly
571generate and test new 'midpoint's until the commit chain is of length
Junio C Hamanoef57d1e2015-03-25 21:23:00572one. Cannot be combined with --first-parent.
Junio C Hamanob0e02952008-01-19 08:02:00573
574--bisect-vars::
Junio C Hamanob73af6c2013-12-03 22:07:11575This calculates the same as `--bisect`, except that refs in
576`refs/bisect/` are not used, and except that this outputs
577text ready to be eval'ed by the shell. These lines will assign the
578name of the midpoint revision to the variable `bisect_rev`, and the
579expected number of commits to be tested after `bisect_rev` is tested
580to `bisect_nr`, the expected number of commits to be tested if
581`bisect_rev` turns out to be good to `bisect_good`, the expected
582number of commits to be tested if `bisect_rev` turns out to be bad to
583`bisect_bad`, and the number of commits we are bisecting right now to
584`bisect_all`.
Junio C Hamanob0e02952008-01-19 08:02:00585
586--bisect-all::
Junio C Hamanob73af6c2013-12-03 22:07:11587This outputs all the commit objects between the included and excluded
588commits, ordered by their distance to the included and excluded
589commits. Refs in `refs/bisect/` are not used. The farthest
590from them is displayed first. (This is the only one displayed by
591`--bisect`.)
Junio C Hamano792c5a92009-03-08 08:45:13592+
Junio C Hamanob0e02952008-01-19 08:02:00593This is useful because it makes it easy to choose a good commit to
594test when you want to avoid to test some of them for some reason (they
595may not compile for example).
Junio C Hamano792c5a92009-03-08 08:45:13596+
Junio C Hamanob0e02952008-01-19 08:02:00597This option can be used along with `--bisect-vars`, in this case,
598after all the sorted commit objects, there will be the same text as if
599`--bisect-vars` had been used alone.
600endif::git-rev-list[]
601
Junio C Hamanob0e02952008-01-19 08:02:00602
603Commit Ordering
604~~~~~~~~~~~~~~~
605
606By default, the commits are shown in reverse chronological order.
607
Junio C Hamanob0e02952008-01-19 08:02:00608--date-order::
Junio C Hamanod0316112012-08-22 19:55:29609Show no parents before all of its children are shown, but
610otherwise show commits in the commit timestamp order.
Junio C Hamanob0e02952008-01-19 08:02:00611
Junio C Hamanoa1952302013-07-01 21:31:18612--author-date-order::
613Show no parents before all of its children are shown, but
614otherwise show commits in the author timestamp order.
615
Junio C Hamanod0316112012-08-22 19:55:29616--topo-order::
617Show no parents before all of its children are shown, and
618avoid showing commits on multiple lines of history
619intermixed.
620+
621For example, in a commit history like this:
622+
623----------------------------------------------------------------
624
625 ---1----2----4----7
626\ \
627 3----5----6----8---
628
629----------------------------------------------------------------
630+
631where the numbers denote the order of commit timestamps, `git
632rev-list` and friends with `--date-order` show the commits in the
633timestamp order: 8 7 6 5 4 3 2 1.
634+
635With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
6363 1); some older commits are shown before newer ones in order to
637avoid showing the commits from two parallel development track mixed
638together.
Junio C Hamanob0e02952008-01-19 08:02:00639
640--reverse::
Junio C Hamanob0e02952008-01-19 08:02:00641Output the commits in reverse order.
Junio C Hamanob73af6c2013-12-03 22:07:11642Cannot be combined with `--walk-reflogs`.
Junio C Hamanob0e02952008-01-19 08:02:00643
644Object Traversal
645~~~~~~~~~~~~~~~~
646
Junio C Hamano076ffcc2013-02-06 05:13:21647These options are mostly targeted for packing of Git repositories.
Junio C Hamanob0e02952008-01-19 08:02:00648
Junio C Hamano6bb32e62015-02-17 22:11:26649ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00650--objects::
Junio C Hamanob0e02952008-01-19 08:02:00651Print the object IDs of any object referenced by the listed
Junio C Hamanob73af6c2013-12-03 22:07:11652commits. `--objects foo ^bar` thus means ``send me
Junio C Hamanob0e02952008-01-19 08:02:00653all object IDs which I need to download if I have the commit
Junio C Hamanob73af6c2013-12-03 22:07:11654object _bar_ but not _foo_''.
Junio C Hamanob0e02952008-01-19 08:02:00655
656--objects-edge::
Junio C Hamanob73af6c2013-12-03 22:07:11657Similar to `--objects`, but also print the IDs of excluded
658commits prefixed with a ``-'' character. This is used by
Junio C Hamano629edff2015-01-12 23:46:02659linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Junio C Hamanob0e02952008-01-19 08:02:00660objects in deltified form based on objects contained in these
661excluded commits to reduce network traffic.
662
Junio C Hamano629edff2015-01-12 23:46:02663--objects-edge-aggressive::
664Similar to `--objects-edge`, but it tries harder to find excluded
665commits at the cost of increased time. This is used instead of
666`--objects-edge` to build ``thin'' packs for shallow repositories.
667
Junio C Hamano6bb32e62015-02-17 22:11:26668--indexed-objects::
669Pretend as if all trees and blobs used by the index are listed
670on the command line. Note that you probably want to use
671`--objects`, too.
672
Junio C Hamanob0e02952008-01-19 08:02:00673--unpacked::
Junio C Hamanob73af6c2013-12-03 22:07:11674Only useful with `--objects`; print the object IDs that are not
Junio C Hamanob0e02952008-01-19 08:02:00675in packs.
Junio C Hamano6bb32e62015-02-17 22:11:26676endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00677
Junio C Hamanoeccdd4a2012-09-10 23:28:17678--no-walk[=(sorted|unsorted)]::
Junio C Hamanoeccdd4a2012-09-10 23:28:17679Only show the given commits, but do not traverse their ancestors.
680This has no effect if a range is specified. If the argument
Junio C Hamanob73af6c2013-12-03 22:07:11681`unsorted` is given, the commits are shown in the order they were
682given on the command line. Otherwise (if `sorted` or no argument
683was given), the commits are shown in reverse chronological order
Junio C Hamanoeccdd4a2012-09-10 23:28:17684by commit time.
Junio C Hamanoef57d1e2015-03-25 21:23:00685Cannot be combined with `--graph`.
Junio C Hamanob0e02952008-01-19 08:02:00686
687--do-walk::
Junio C Hamanob73af6c2013-12-03 22:07:11688Overrides a previous `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:22689
690Commit Formatting
691~~~~~~~~~~~~~~~~~
692
693ifdef::git-rev-list[]
694Using these options, linkgit:git-rev-list[1] will act similar to the
695more specialized family of commit log tools: linkgit:git-log[1],
696linkgit:git-show[1], and linkgit:git-whatchanged[1]
697endif::git-rev-list[]
698
699include::pretty-options.txt[]
700
701--relative-date::
Junio C Hamanod2c978f2011-03-20 19:42:22702Synonym for `--date=relative`.
703
Junio C Hamanoac12f0e2014-09-19 22:32:51704--date=(relative|local|default|iso|iso-strict|rfc|short|raw)::
Junio C Hamanod2c978f2011-03-20 19:42:22705Only takes effect for dates shown in human-readable format, such
Junio C Hamanob73af6c2013-12-03 22:07:11706as when using `--pretty`. `log.date` config variable sets a default
707value for the log command's `--date` option.
Junio C Hamanod2c978f2011-03-20 19:42:22708+
709`--date=relative` shows dates relative to the current time,
Junio C Hamanob73af6c2013-12-03 22:07:11710e.g. ``2 hours ago''.
Junio C Hamanod2c978f2011-03-20 19:42:22711+
Junio C Hamanoe3acfb82013-11-12 23:22:57712`--date=local` shows timestamps in user's local time zone.
Junio C Hamanod2c978f2011-03-20 19:42:22713+
Junio C Hamanoac12f0e2014-09-19 22:32:51714`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
715The differences to the strict ISO 8601 format are:
716
717- a space instead of the `T` date/time delimiter
718- a space between time and time zone
719- no colon between hours and minutes of the time zone
720
721+
722`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
723ISO 8601 format.
Junio C Hamanod2c978f2011-03-20 19:42:22724+
725`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Junio C Hamanob73af6c2013-12-03 22:07:11726format, often found in email messages.
Junio C Hamanod2c978f2011-03-20 19:42:22727+
Junio C Hamanob73af6c2013-12-03 22:07:11728`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Junio C Hamanod2c978f2011-03-20 19:42:22729+
Junio C Hamano076ffcc2013-02-06 05:13:21730`--date=raw` shows the date in the internal raw Git format `%s %z` format.
Junio C Hamanod2c978f2011-03-20 19:42:22731+
Junio C Hamanod7ed4042015-08-03 19:43:00732`--date=format:...` feeds the format `...` to your system `strftime`.
733Use `--date=format:%c` to show the date in your system locale's
734preferred format. See the `strftime` manual for a complete list of
735format placeholders.
736+
Junio C Hamanoe3acfb82013-11-12 23:22:57737`--date=default` shows timestamps in the original time zone
Junio C Hamanod2c978f2011-03-20 19:42:22738(either committer's or author's).
739
740ifdef::git-rev-list[]
741--header::
Junio C Hamanod2c978f2011-03-20 19:42:22742Print the contents of the commit in raw-format; each record is
743separated with a NUL character.
744endif::git-rev-list[]
745
746--parents::
Junio C Hamanod2c978f2011-03-20 19:42:22747Print also the parents of the commit (in the form "commit parent...").
748Also enables parent rewriting, see 'History Simplification' below.
749
750--children::
Junio C Hamanod2c978f2011-03-20 19:42:22751Print also the children of the commit (in the form "commit child...").
752Also enables parent rewriting, see 'History Simplification' below.
753
754ifdef::git-rev-list[]
755--timestamp::
756Print the raw commit timestamp.
757endif::git-rev-list[]
758
759--left-right::
Junio C Hamanod2c978f2011-03-20 19:42:22760Mark which side of a symmetric diff a commit is reachable from.
761Commits from the left side are prefixed with `<` and those from
762the right with `>`. If combined with `--boundary`, those
763commits are prefixed with `-`.
764+
765For example, if you have this topology:
766+
767-----------------------------------------------------------------------
768 y---b---b branch B
769 / \ /
770 / .
771 / / \
772 o---x---a---a branch A
773-----------------------------------------------------------------------
774+
775you would get an output like this:
776+
777-----------------------------------------------------------------------
778$ git rev-list --left-right --boundary --pretty=oneline A...B
779
780>bbbbbbb... 3rd on b
781>bbbbbbb... 2nd on b
782<aaaaaaa... 3rd on a
783<aaaaaaa... 2nd on a
784-yyyyyyy... 1st on b
785-xxxxxxx... 1st on a
786-----------------------------------------------------------------------
787
788--graph::
Junio C Hamanod2c978f2011-03-20 19:42:22789Draw a text-based graphical representation of the commit history
790on the left hand side of the output. This may cause extra lines
791to be printed in between commits, in order for the graph history
792to be drawn properly.
Junio C Hamanoef57d1e2015-03-25 21:23:00793Cannot be combined with `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:22794+
795This enables parent rewriting, see 'History Simplification' below.
796+
Junio C Hamanob73af6c2013-12-03 22:07:11797This implies the `--topo-order` option by default, but the
798`--date-order` option may also be specified.
Junio C Hamanod2c978f2011-03-20 19:42:22799
Junio C Hamano624dd4c2014-04-03 21:56:30800--show-linear-break[=<barrier>]::
801When --graph is not used, all history branches are flattened
802which can make it hard to see that the two consecutive commits
803do not belong to a linear branch. This option puts a barrier
804in between them in that case. If `<barrier>` is specified, it
805is the string that will be shown instead of the default one.
806
Junio C Hamanod2c978f2011-03-20 19:42:22807ifdef::git-rev-list[]
808--count::
809Print a number stating how many commits would have been
810listed, and suppress all other output. When used together
Junio C Hamanob73af6c2013-12-03 22:07:11811with `--left-right`, instead print the counts for left and
Junio C Hamanob77f8192011-05-05 01:30:38812right commits, separated by a tab. When used together with
Junio C Hamanob73af6c2013-12-03 22:07:11813`--cherry-mark`, omit patch equivalent commits from these
Junio C Hamanob77f8192011-05-05 01:30:38814counts and print the count for equivalent commits separated
815by a tab.
Junio C Hamanod2c978f2011-03-20 19:42:22816endif::git-rev-list[]
817
Junio C Hamanod2c978f2011-03-20 19:42:22818ifndef::git-rev-list[]
819Diff Formatting
820~~~~~~~~~~~~~~~
821
Junio C Hamanob73af6c2013-12-03 22:07:11822Listed below are options that control the formatting of diff output.
Junio C Hamanod2c978f2011-03-20 19:42:22823Some of them are specific to linkgit:git-rev-list[1], however other diff
824options may be given. See linkgit:git-diff-files[1] for more options.
825
826-c::
Junio C Hamanod2c978f2011-03-20 19:42:22827With this option, diff output for a merge commit
828shows the differences from each of the parents to the merge result
829simultaneously instead of showing pairwise diff between a parent
830and the result one at a time. Furthermore, it lists only files
831which were modified from all parents.
832
833--cc::
Junio C Hamanob73af6c2013-12-03 22:07:11834This flag implies the `-c` option and further compresses the
Junio C Hamanod2c978f2011-03-20 19:42:22835patch output by omitting uninteresting hunks whose contents in
836the parents have only two variants and the merge result picks
837one of them without modification.
838
839-m::
Junio C Hamanod2c978f2011-03-20 19:42:22840This flag makes the merge commits show the full diff like
841regular commits; for each merge parent, a separate log entry
842and diff is generated. An exception is that only diff against
Junio C Hamanob73af6c2013-12-03 22:07:11843the first parent is shown when `--first-parent` option is given;
Junio C Hamanod2c978f2011-03-20 19:42:22844in that case, the output represents the changes the merge
845brought _into_ the then-current branch.
846
847-r::
Junio C Hamanod2c978f2011-03-20 19:42:22848Show recursive diffs.
849
850-t::
Junio C Hamanob73af6c2013-12-03 22:07:11851Show the tree objects in the diff output. This implies `-r`.
Junio C Hamanod2c978f2011-03-20 19:42:22852endif::git-rev-list[]