blob: 77ac439234f40f51aae8613a672de06e3e143771 [file] [log] [blame]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +01001Commit 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 Hamanoa23e3132012-09-13 18:54:30 -07006limiting 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`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010015
16--
17
Nguyễn Thái Ngọc Duy70c2a252012-09-06 21:28:03 +070018-<number>::
19-n <number>::
Matthieu Moy982962c2009-04-07 19:24:33 +020020--max-count=<number>::
Michael J Gruber841d8112011-03-08 09:31:24 +010021 Limit the number of commits to output.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010022
Matthieu Moy982962c2009-04-07 19:24:33 +020023--skip=<number>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010024 Skip 'number' commits before starting to show the commit output.
25
Matthieu Moy982962c2009-04-07 19:24:33 +020026--since=<date>::
27--after=<date>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010028 Show commits more recent than a specific date.
29
Matthieu Moy982962c2009-04-07 19:24:33 +020030--until=<date>::
31--before=<date>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010032 Show commits older than a specific date.
33
Jakub Narebski56b6d012008-03-02 15:11:35 +010034ifdef::git-rev-list[]
Matthieu Moy982962c2009-04-07 19:24:33 +020035--max-age=<timestamp>::
36--min-age=<timestamp>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010037 Limit the commits output to specified time range.
Jakub Narebski56b6d012008-03-02 15:11:35 +010038endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010039
Matthieu Moy982962c2009-04-07 19:24:33 +020040--author=<pattern>::
41--committer=<pattern>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010042 Limit the commits output to ones with author/committer
Junio C Hamanoa23e3132012-09-13 18:54:30 -070043 header lines that match the specified pattern (regular
44 expression). With more than one `--author=<pattern>`,
45 commits whose author matches any of the given patterns are
46 chosen (similarly for multiple `--committer=<pattern>`).
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010047
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +070048--grep-reflog=<pattern>::
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +070049 Limit the commits output to ones with reflog entries that
50 match the specified pattern (regular expression). With
51 more than one `--grep-reflog`, commits whose reflog message
Junio C Hamanobaa63782012-09-29 11:59:52 -070052 matches any of the given patterns are chosen. It is an
53 error to use this option unless `--walk-reflogs` is in use.
Nguyễn Thái Ngọc Duy72fd13f2012-09-29 11:41:28 +070054
Matthieu Moy982962c2009-04-07 19:24:33 +020055--grep=<pattern>::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010056 Limit the commits output to ones with log message that
Junio C Hamanoa23e3132012-09-13 18:54:30 -070057 matches the specified pattern (regular expression). With
58 more than one `--grep=<pattern>`, commits whose message
59 matches any of the given patterns are chosen (but see
60 `--all-match`).
Nguyễn Thái Ngọc Duy38cfe912012-09-29 11:41:29 +070061+
Michael J Gruber7348cde2015-04-17 16:28:56 +020062When `--show-notes` is in effect, the message from the notes is
63matched as if it were part of the log message.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010064
Mikael Magnusson7756ba72008-11-02 19:32:46 +010065--all-match::
Jason St. John4528aa12013-11-14 20:34:01 -050066 Limit the commits output to ones that match all given `--grep`,
Junio C Hamanoa23e3132012-09-13 18:54:30 -070067 instead of ones that match at least one.
Mikael Magnusson7756ba72008-11-02 19:32:46 +010068
Christoph Junghans22dfa8a2015-01-12 18:33:32 -070069--invert-grep::
70 Limit the commits output to ones with log message that do not
71 match the pattern specified with `--grep=<pattern>`.
72
Stephan Beyer32402402008-06-08 03:36:09 +020073-i::
74--regexp-ignore-case::
Jason St. John19d6eb42013-11-14 20:34:02 -050075 Match the regular expression limiting patterns without regard to letter
76 case.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010077
Junio C Hamano727b6fc2012-10-03 15:01:34 -070078--basic-regexp::
Junio C Hamano727b6fc2012-10-03 15:01:34 -070079 Consider the limiting patterns to be basic regular expressions;
80 this is the default.
81
Stephan Beyer32402402008-06-08 03:36:09 +020082-E::
83--extended-regexp::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010084 Consider the limiting patterns to be extended regular expressions
85 instead of the default basic regular expressions.
86
Stephan Beyer32402402008-06-08 03:36:09 +020087-F::
88--fixed-strings::
Jakub Narebskidc1c0ff2008-02-26 13:22:05 +010089 Consider the limiting patterns to be fixed strings (don't interpret
90 pattern as a regular expression).
91
Junio C Hamano727b6fc2012-10-03 15:01:34 -070092--perl-regexp::
Jason St. John19d6eb42013-11-14 20:34:02 -050093 Consider the limiting patterns to be Perl-compatible regular expressions.
Junio C Hamano727b6fc2012-10-03 15:01:34 -070094 Requires libpcre to be compiled in.
95
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010096--remove-empty::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010097 Stop when a given path disappears from the tree.
98
SZEDER Gábor26574202009-07-13 17:11:44 +020099--merges::
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100100 Print only merge commits. This is exactly the same as `--min-parents=2`.
SZEDER Gábor26574202009-07-13 17:11:44 +0200101
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100102--no-merges::
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100103 Do not print commits with more than one parent. This is
104 exactly the same as `--max-parents=1`.
105
106--min-parents=<number>::
107--max-parents=<number>::
108--no-min-parents::
109--no-max-parents::
Torstein Hegge5104d212013-08-02 20:40:07 +0200110 Show only commits which have at least (or at most) that many parent
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100111 commits. In particular, `--max-parents=1` is the same as `--no-merges`,
112 `--min-parents=2` is the same as `--merges`. `--max-parents=0`
113 gives all root commits and `--min-parents=3` all octopus merges.
114+
115`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
116again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
117parents) and `--max-parents=-1` (negative numbers denote no upper limit).
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100118
119--first-parent::
120 Follow only the first parent commit upon seeing a merge
121 commit. This option can give a better overview when
122 viewing the evolution of a particular topic branch,
123 because merges into a topic branch tend to be only about
124 adjusting to updated upstream from time to time, and
125 this option allows you to ignore the individual commits
Kevin Daudtf88851c2015-03-19 23:14:08 +0100126 brought in to your history by such a merge. Cannot be
127 combined with --bisect.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100128
129--not::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100130 Reverses the meaning of the '{caret}' prefix (or lack thereof)
Jason St. John4528aa12013-11-14 20:34:01 -0500131 for all following revision specifiers, up to the next `--not`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100132
133--all::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500134 Pretend as if all the refs in `refs/` are listed on the
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100135 command line as '<commit>'.
136
Štěpán Němec62b46982010-10-08 19:31:15 +0200137--branches[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500138 Pretend as if all the refs in `refs/heads` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200139 on the command line as '<commit>'. If '<pattern>' is given, limit
Ilari Liusvaarab09fe972010-01-20 11:48:26 +0200140 branches to ones matching given shell glob. If pattern lacks '?',
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100141 '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000142
Štěpán Němec62b46982010-10-08 19:31:15 +0200143--tags[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500144 Pretend as if all the refs in `refs/tags` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200145 on the command line as '<commit>'. If '<pattern>' is given, limit
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100146 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
147 or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000148
Štěpán Němec62b46982010-10-08 19:31:15 +0200149--remotes[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500150 Pretend as if all the refs in `refs/remotes` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200151 on the command line as '<commit>'. If '<pattern>' is given, limit
Matthieu Moy0e615b22010-11-02 16:31:20 +0100152 remote-tracking branches to ones matching given shell glob.
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100153 If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000154
Štěpán Němec62b46982010-10-08 19:31:15 +0200155--glob=<glob-pattern>::
156 Pretend as if all the refs matching shell glob '<glob-pattern>'
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200157 are listed on the command line as '<commit>'. Leading 'refs/',
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100158 is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
159 or '[', '/{asterisk}' at the end is implied.
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200160
Johannes Sixt574d3702013-09-02 22:11:26 +0200161--exclude=<glob-pattern>::
162
163 Do not include refs matching '<glob-pattern>' that the next `--all`,
164 `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
165 consider. Repetitions of this option accumulate exclusion patterns
166 up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
167 `--glob` option (other options or arguments do not clear
Thomas Ackermannf745acb2014-11-03 21:37:07 +0100168 accumulated patterns).
Johannes Sixt574d3702013-09-02 22:11:26 +0200169+
170The patterns given should not begin with `refs/heads`, `refs/tags`, or
171`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
172respectively, and they must begin with `refs/` when applied to `--glob`
173or `--all`. If a trailing '/{asterisk}' is intended, it must be given
174explicitly.
175
Jeff King41d018d2014-10-15 18:43:28 -0400176--reflog::
177 Pretend as if all objects mentioned by reflogs are listed on the
178 command line as `<commit>`.
179
Junio C Hamanocc243c32011-05-18 18:08:09 -0700180--ignore-missing::
Junio C Hamanocc243c32011-05-18 18:08:09 -0700181 Upon seeing an invalid object name in the input, pretend as if
182 the bad input was not given.
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200183
Christian Couderaf06e932009-11-24 07:54:44 +0100184ifndef::git-rev-list[]
185--bisect::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500186 Pretend as if the bad bisection ref `refs/bisect/bad`
Christian Couderaf06e932009-11-24 07:54:44 +0100187 was listed and as if it was followed by `--not` and the good
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500188 bisection refs `refs/bisect/good-*` on the command
Kevin Daudtf88851c2015-03-19 23:14:08 +0100189 line. Cannot be combined with --first-parent.
Christian Couderaf06e932009-11-24 07:54:44 +0100190endif::git-rev-list[]
191
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100192--stdin::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100193 In addition to the '<commit>' listed on the command
Junio C Hamano60da8b12009-11-20 02:50:21 -0800194 line, read them from the standard input. If a '--' separator is
195 seen, stop reading commits and start reading paths to limit the
196 result.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100197
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800198ifdef::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100199--quiet::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100200 Don't print anything to standard output. This form
201 is primarily meant to allow the caller to
202 test the exit status to see if a range of objects is fully
203 connected (or not). It is faster than redirecting stdout
Jason St. John4528aa12013-11-14 20:34:01 -0500204 to `/dev/null` as the output does not have to be formatted.
Junio C Hamanoadf60f12008-06-03 23:56:56 -0700205endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100206
Michael J Grubercb56e302011-03-07 13:31:41 +0100207--cherry-mark::
Michael J Grubercb56e302011-03-07 13:31:41 +0100208 Like `--cherry-pick` (see below) but mark equivalent commits
209 with `=` rather than omitting them, and inequivalent ones with `+`.
210
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100211--cherry-pick::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100212 Omit any commit that introduces the same change as
Jason St. John4528aa12013-11-14 20:34:01 -0500213 another commit on the ``other side'' when the set of
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100214 commits are limited with symmetric difference.
215+
216For example, if you have two branches, `A` and `B`, a usual way
217to list all commits on only one side of them is with
Junio C Hamano3add01b2011-04-01 11:04:46 -0700218`--left-right` (see the example below in the description of
Jason St. John19d6eb42013-11-14 20:34:02 -0500219the `--left-right` option). However, it shows the commits that were
220cherry-picked from the other branch (for example, ``3rd on b'' may be
221cherry-picked from branch A). With this option, such pairs of commits are
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100222excluded from the output.
223
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100224--left-only::
225--right-only::
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100226 List only commits on the respective side of a symmetric range,
227 i.e. only those which would be marked `<` resp. `>` by
228 `--left-right`.
229+
230For example, `--cherry-pick --right-only A...B` omits those
231commits from `B` which are in `A` or are patch-equivalent to a commit in
Jeff King6cf378f2012-04-26 04:51:57 -0400232`A`. In other words, this lists the `+` commits from `git cherry A B`.
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100233More precisely, `--cherry-pick --right-only --no-merges` gives the exact
234list.
235
Michael J Gruber94f605e2011-03-07 13:31:42 +0100236--cherry::
Michael J Gruber94f605e2011-03-07 13:31:42 +0100237 A synonym for `--right-only --cherry-mark --no-merges`; useful to
238 limit the output to the commits on our side and mark those that
239 have been applied to the other side of a forked history with
240 `git log --cherry upstream...mybranch`, similar to
241 `git cherry upstream mybranch`.
242
Stephan Beyer32402402008-06-08 03:36:09 +0200243-g::
244--walk-reflogs::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100245 Instead of walking the commit ancestry chain, walk
246 reflog entries from the most recent one to older ones.
247 When this option is used you cannot specify commits to
248 exclude (that is, '{caret}commit', 'commit1..commit2',
Justin Lebara58088a2014-03-31 15:11:44 -0700249 and 'commit1\...commit2' notations cannot be used).
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100250+
Jason St. John4528aa12013-11-14 20:34:01 -0500251With `--pretty` format other than `oneline` (for obvious reasons),
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100252this causes the output to have two extra lines of information
253taken from the reflog. By default, 'commit@\{Nth}' notation is
254used in the output. When the starting commit is specified as
Thomas Rast18a21972008-08-10 15:04:34 +0200255'commit@\{now}', output also uses 'commit@\{timestamp}' notation
Jason St. John4528aa12013-11-14 20:34:01 -0500256instead. Under `--pretty=oneline`, the commit message is
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100257prefixed with this information on the same line.
Jason St. John4528aa12013-11-14 20:34:01 -0500258This option cannot be combined with `--reverse`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100259See also linkgit:git-reflog[1].
260
261--merge::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100262 After a failed merge, show refs that touch files having a
263 conflict and don't exist on all heads to merge.
264
265--boundary::
Kevin Braceye32db662013-05-16 18:32:33 +0300266 Output excluded boundary commits. Boundary commits are
267 prefixed with `-`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100268
Vicent Martiaa329392013-12-21 09:00:12 -0500269ifdef::git-rev-list[]
270--use-bitmap-index::
271
272 Try to speed up the traversal using the pack bitmap index (if
273 one is available). Note that when traversing with `--objects`,
274 trees and blobs will not have their associated path printed.
275endif::git-rev-list[]
276
Thomas Rast70d98952008-08-12 01:55:36 +0200277--
278
279History Simplification
280~~~~~~~~~~~~~~~~~~~~~~
281
Santi Béjar7bc25082008-11-12 11:51:28 +0100282Sometimes you are only interested in parts of the history, for example the
283commits modifying a particular <path>. But there are two parts of
284'History Simplification', one part is selecting the commits and the other
285is how to do it, as there are various strategies to simplify the history.
286
287The following options select the commits to be shown:
288
289<paths>::
Santi Béjar7bc25082008-11-12 11:51:28 +0100290 Commits modifying the given <paths> are selected.
291
292--simplify-by-decoration::
Santi Béjar7bc25082008-11-12 11:51:28 +0100293 Commits that are referred by some branch or tag are selected.
294
295Note that extra commits can be shown to give a meaningful history.
296
297The following options affect the way the simplification is performed:
298
299Default mode::
Santi Béjar7bc25082008-11-12 11:51:28 +0100300 Simplifies the history to the simplest history explaining the
301 final state of the tree. Simplest because it prunes some side
302 branches if the end result is the same (i.e. merging branches
303 with the same content)
304
305--full-history::
Jack Nageldf6b0ca2011-07-21 20:33:15 -0500306 Same as the default mode, but does not prune some history.
Santi Béjar7bc25082008-11-12 11:51:28 +0100307
308--dense::
Santi Béjar7bc25082008-11-12 11:51:28 +0100309 Only the selected commits are shown, plus some to have a
310 meaningful history.
311
312--sparse::
Santi Béjar7bc25082008-11-12 11:51:28 +0100313 All commits in the simplified history are shown.
314
315--simplify-merges::
Jason St. John4528aa12013-11-14 20:34:01 -0500316 Additional option to `--full-history` to remove some needless
Santi Béjar7bc25082008-11-12 11:51:28 +0100317 merges from the resulting history, as there are no selected
318 commits contributing to this merge.
319
Johan Herland57456ef2010-06-04 01:17:35 +0200320--ancestry-path::
Johan Herland57456ef2010-06-04 01:17:35 +0200321 When given a range of commits to display (e.g. 'commit1..commit2'
322 or 'commit2 {caret}commit1'), only display commits that exist
323 directly on the ancestry chain between the 'commit1' and
324 'commit2', i.e. commits that are both descendants of 'commit1',
325 and ancestors of 'commit2'.
326
Santi Béjar7bc25082008-11-12 11:51:28 +0100327A more detailed explanation follows.
Thomas Rast70d98952008-08-12 01:55:36 +0200328
329Suppose you specified `foo` as the <paths>. We shall call commits
330that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
331filtered for `foo`, they look different and equal, respectively.)
332
333In the following, we will always refer to the same example history to
334illustrate the differences between simplification settings. We assume
335that you are filtering for a file `foo` in this commit graph:
336-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300337 .-A---M---N---O---P---Q
338 / / / / / /
339 I B C D E Y
340 \ / / / / /
341 `-------------' X
Thomas Rast70d98952008-08-12 01:55:36 +0200342-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300343The horizontal line of history A---Q is taken to be the first parent of
Thomas Rast70d98952008-08-12 01:55:36 +0200344each merge. The commits are:
345
346* `I` is the initial commit, in which `foo` exists with contents
Jason St. John4528aa12013-11-14 20:34:01 -0500347 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Thomas Rast70d98952008-08-12 01:55:36 +0200348 commits are compared to an empty tree, so `I` is !TREESAME.
349
Jason St. John4528aa12013-11-14 20:34:01 -0500350* In `A`, `foo` contains just ``foo''.
Thomas Rast70d98952008-08-12 01:55:36 +0200351
352* `B` contains the same change as `A`. Its merge `M` is trivial and
353 hence TREESAME to all parents.
354
Jason St. John4528aa12013-11-14 20:34:01 -0500355* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Thomas Rast70d98952008-08-12 01:55:36 +0200356 so it is not TREESAME to any parent.
357
Jason St. John4528aa12013-11-14 20:34:01 -0500358* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
359 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
Thomas Rast70d98952008-08-12 01:55:36 +0200360
Jason St. John4528aa12013-11-14 20:34:01 -0500361* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
362 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
Thomas Rast70d98952008-08-12 01:55:36 +0200363
Ondřej Bílka17b83d72013-07-22 23:02:23 +0200364* `X` is an independent root commit that added a new file `side`, and `Y`
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300365 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
366 `Q` is TREESAME to `P`, but not to `Y`.
367
Jason St. John4528aa12013-11-14 20:34:01 -0500368`rev-list` walks backwards through history, including or excluding
369commits based on whether `--full-history` and/or parent rewriting
370(via `--parents` or `--children`) are used. The following settings
Thomas Rast70d98952008-08-12 01:55:36 +0200371are available.
372
373Default mode::
Thomas Rast70d98952008-08-12 01:55:36 +0200374 Commits are included if they are not TREESAME to any parent
Jason St. John4528aa12013-11-14 20:34:01 -0500375 (though this can be changed, see `--sparse` below). If the
Thomas Rast70d98952008-08-12 01:55:36 +0200376 commit was a merge, and it was TREESAME to one parent, follow
377 only that parent. (Even if there are several TREESAME
378 parents, follow only one of them.) Otherwise, follow all
379 parents.
380+
381This results in:
382+
383-----------------------------------------------------------------------
384 .-A---N---O
Johan Herlandf70d0582010-06-04 01:17:33 +0200385 / / /
Thomas Rast70d98952008-08-12 01:55:36 +0200386 I---------D
387-----------------------------------------------------------------------
388+
389Note how the rule to only follow the TREESAME parent, if one is
390available, removed `B` from consideration entirely. `C` was
391considered via `N`, but is TREESAME. Root commits are compared to an
392empty tree, so `I` is !TREESAME.
393+
Jason St. John4528aa12013-11-14 20:34:01 -0500394Parent/child relations are only visible with `--parents`, but that does
Thomas Rast70d98952008-08-12 01:55:36 +0200395not affect the commits selected in default mode, so we have shown the
396parent lines.
397
398--full-history without parent rewriting::
Thomas Rast70d98952008-08-12 01:55:36 +0200399 This mode differs from the default in one point: always follow
400 all parents of a merge, even if it is TREESAME to one of them.
401 Even if more than one side of the merge has commits that are
402 included, this does not imply that the merge itself is! In
403 the example, we get
404+
405-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300406 I A B N D O P Q
Thomas Rast70d98952008-08-12 01:55:36 +0200407-----------------------------------------------------------------------
408+
Kevin Braceyd0af6632013-05-16 18:32:34 +0300409`M` was excluded because it is TREESAME to both parents. `E`,
Thomas Rast70d98952008-08-12 01:55:36 +0200410`C` and `B` were all walked, but only `B` was !TREESAME, so the others
411do not appear.
412+
413Note that without parent rewriting, it is not really possible to talk
414about the parent/child relationships between the commits, so we show
415them disconnected.
416
417--full-history with parent rewriting::
Thomas Rast70d98952008-08-12 01:55:36 +0200418 Ordinary commits are only included if they are !TREESAME
Jason St. John4528aa12013-11-14 20:34:01 -0500419 (though this can be changed, see `--sparse` below).
Thomas Rast70d98952008-08-12 01:55:36 +0200420+
421Merges are always included. However, their parent list is rewritten:
422Along each parent, prune away commits that are not included
423themselves. This results in
424+
425-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300426 .-A---M---N---O---P---Q
Thomas Rast70d98952008-08-12 01:55:36 +0200427 / / / / /
428 I B / D /
429 \ / / / /
430 `-------------'
431-----------------------------------------------------------------------
432+
Jason St. John4528aa12013-11-14 20:34:01 -0500433Compare to `--full-history` without rewriting above. Note that `E`
Thomas Rast70d98952008-08-12 01:55:36 +0200434was pruned away because it is TREESAME, but the parent list of P was
435rewritten to contain `E`'s parent `I`. The same happened for `C` and
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300436`N`, and `X`, `Y` and `Q`.
Thomas Rast70d98952008-08-12 01:55:36 +0200437
438In addition to the above settings, you can change whether TREESAME
439affects inclusion:
440
Stephan Beyer32402402008-06-08 03:36:09 +0200441--dense::
Thomas Rast70d98952008-08-12 01:55:36 +0200442 Commits that are walked are included if they are not TREESAME
443 to any parent.
444
Stephan Beyer32402402008-06-08 03:36:09 +0200445--sparse::
Thomas Rast70d98952008-08-12 01:55:36 +0200446 All commits that are walked are included.
447+
Jason St. John4528aa12013-11-14 20:34:01 -0500448Note that without `--full-history`, this still simplifies merges: if
Thomas Rast70d98952008-08-12 01:55:36 +0200449one of the parents is TREESAME, we follow only that one, so the other
450sides of the merge are never walked.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100451
Thomas Rastd266a982008-08-12 01:55:37 +0200452--simplify-merges::
Thomas Rastd266a982008-08-12 01:55:37 +0200453 First, build a history graph in the same way that
Jason St. John4528aa12013-11-14 20:34:01 -0500454 `--full-history` with parent rewriting does (see above).
Thomas Rastd266a982008-08-12 01:55:37 +0200455+
456Then simplify each commit `C` to its replacement `C'` in the final
457history according to the following rules:
458+
459--
460* Set `C'` to `C`.
461+
462* Replace each parent `P` of `C'` with its simplification `P'`. In
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300463 the process, drop parents that are ancestors of other parents or that are
464 root commits TREESAME to an empty tree, and remove duplicates, but take care
465 to never drop all parents that we are TREESAME to.
Thomas Rastd266a982008-08-12 01:55:37 +0200466+
467* If after this parent rewriting, `C'` is a root or merge commit (has
468 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
469 Otherwise, it is replaced with its only parent.
470--
471+
472The effect of this is best shown by way of comparing to
Jason St. John4528aa12013-11-14 20:34:01 -0500473`--full-history` with parent rewriting. The example turns into:
Thomas Rastd266a982008-08-12 01:55:37 +0200474+
475-----------------------------------------------------------------------
476 .-A---M---N---O
477 / / /
478 I B D
479 \ / /
480 `---------'
481-----------------------------------------------------------------------
482+
Jason St. John19d6eb42013-11-14 20:34:02 -0500483Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Thomas Rastd266a982008-08-12 01:55:37 +0200484+
485--
486* `N`'s parent list had `I` removed, because it is an ancestor of the
487 other parent `M`. Still, `N` remained because it is !TREESAME.
488+
489* `P`'s parent list similarly had `I` removed. `P` was then
490 removed completely, because it had one parent and is TREESAME.
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300491+
492* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
493 was a TREESAME root. `Q` was then removed completely, because it had one
494 parent and is TREESAME.
Thomas Rastd266a982008-08-12 01:55:37 +0200495--
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100496
Johan Herland57456ef2010-06-04 01:17:35 +0200497Finally, there is a fifth simplification mode available:
498
499--ancestry-path::
Johan Herland57456ef2010-06-04 01:17:35 +0200500 Limit the displayed commits to those directly on the ancestry
Jason St. John4528aa12013-11-14 20:34:01 -0500501 chain between the ``from'' and ``to'' commits in the given commit
502 range. I.e. only display commits that are ancestor of the ``to''
Jason St. John19d6eb42013-11-14 20:34:02 -0500503 commit and descendants of the ``from'' commit.
Johan Herland57456ef2010-06-04 01:17:35 +0200504+
505As an example use case, consider the following commit history:
506+
507-----------------------------------------------------------------------
508 D---E-------F
509 / \ \
510 B---C---G---H---I---J
511 / \
512 A-------K---------------L--M
513-----------------------------------------------------------------------
514+
515A regular 'D..M' computes the set of commits that are ancestors of `M`,
516but excludes the ones that are ancestors of `D`. This is useful to see
517what happened to the history leading to `M` since `D`, in the sense
Jason St. John4528aa12013-11-14 20:34:01 -0500518that ``what does `M` have that did not exist in `D`''. The result in this
Johan Herland57456ef2010-06-04 01:17:35 +0200519example would be all the commits, except `A` and `B` (and `D` itself,
520of course).
521+
522When we want to find out what commits in `M` are contaminated with the
523bug introduced by `D` and need fixing, however, we might want to view
524only the subset of 'D..M' that are actually descendants of `D`, i.e.
Jason St. John4528aa12013-11-14 20:34:01 -0500525excluding `C` and `K`. This is exactly what the `--ancestry-path`
Johan Herland57456ef2010-06-04 01:17:35 +0200526option does. Applied to the 'D..M' range, it results in:
527+
528-----------------------------------------------------------------------
529 E-------F
530 \ \
531 G---H---I---J
532 \
533 L--M
534-----------------------------------------------------------------------
535
Jason St. John4528aa12013-11-14 20:34:01 -0500536The `--simplify-by-decoration` option allows you to view only the
Nanako Shiraishi3fcfd662008-11-10 18:58:17 +0900537big picture of the topology of the history, by omitting commits
538that are not referenced by tags. Commits are marked as !TREESAME
539(in other words, kept after history simplification rules described
540above) if (1) they are referenced by tags, or (2) they change the
541contents of the paths given on the command line. All other
542commits are marked as TREESAME (subject to be simplified away).
543
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100544ifdef::git-rev-list[]
Thomas Rast70d98952008-08-12 01:55:36 +0200545Bisection Helpers
546~~~~~~~~~~~~~~~~~
547
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100548--bisect::
Jason St. John4528aa12013-11-14 20:34:01 -0500549 Limit output to the one commit object which is roughly halfway between
550 included and excluded commits. Note that the bad bisection ref
551 `refs/bisect/bad` is added to the included commits (if it
552 exists) and the good bisection refs `refs/bisect/good-*` are
553 added to the excluded commits (if they exist). Thus, supposing there
554 are no refs in `refs/bisect/`, if
555+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100556-----------------------------------------------------------------------
Christian Couder6514aa32008-11-09 14:46:35 +0100557 $ git rev-list --bisect foo ^bar ^baz
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100558-----------------------------------------------------------------------
Jason St. John4528aa12013-11-14 20:34:01 -0500559+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100560outputs 'midpoint', the output of the two commands
Jason St. John4528aa12013-11-14 20:34:01 -0500561+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100562-----------------------------------------------------------------------
Christian Couder6514aa32008-11-09 14:46:35 +0100563 $ git rev-list foo ^midpoint
564 $ git rev-list midpoint ^bar ^baz
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100565-----------------------------------------------------------------------
Jason St. John4528aa12013-11-14 20:34:01 -0500566+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100567would be of roughly the same length. Finding the change which
568introduces a regression is thus reduced to a binary search: repeatedly
569generate and test new 'midpoint's until the commit chain is of length
Kevin Daudtf88851c2015-03-19 23:14:08 +0100570one. Cannot be combined with --first-parent.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100571
572--bisect-vars::
Jason St. John4528aa12013-11-14 20:34:01 -0500573 This calculates the same as `--bisect`, except that refs in
574 `refs/bisect/` are not used, and except that this outputs
575 text ready to be eval'ed by the shell. These lines will assign the
576 name of the midpoint revision to the variable `bisect_rev`, and the
577 expected number of commits to be tested after `bisect_rev` is tested
578 to `bisect_nr`, the expected number of commits to be tested if
579 `bisect_rev` turns out to be good to `bisect_good`, the expected
580 number of commits to be tested if `bisect_rev` turns out to be bad to
581 `bisect_bad`, and the number of commits we are bisecting right now to
582 `bisect_all`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100583
584--bisect-all::
Jason St. John4528aa12013-11-14 20:34:01 -0500585 This outputs all the commit objects between the included and excluded
586 commits, ordered by their distance to the included and excluded
587 commits. Refs in `refs/bisect/` are not used. The farthest
588 from them is displayed first. (This is the only one displayed by
589 `--bisect`.)
Christian Couder3d2d4f92009-03-07 13:37:24 +0100590+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100591This is useful because it makes it easy to choose a good commit to
592test when you want to avoid to test some of them for some reason (they
593may not compile for example).
Christian Couder3d2d4f92009-03-07 13:37:24 +0100594+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100595This option can be used along with `--bisect-vars`, in this case,
596after all the sorted commit objects, there will be the same text as if
597`--bisect-vars` had been used alone.
598endif::git-rev-list[]
599
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100600
601Commit Ordering
602~~~~~~~~~~~~~~~
603
604By default, the commits are shown in reverse chronological order.
605
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100606--date-order::
Junio C Hamano3f0350c2012-08-15 13:02:48 -0700607 Show no parents before all of its children are shown, but
608 otherwise show commits in the commit timestamp order.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100609
Junio C Hamano81c6b382013-06-07 10:35:54 -0700610--author-date-order::
611 Show no parents before all of its children are shown, but
612 otherwise show commits in the author timestamp order.
613
Junio C Hamano3f0350c2012-08-15 13:02:48 -0700614--topo-order::
615 Show no parents before all of its children are shown, and
616 avoid showing commits on multiple lines of history
617 intermixed.
618+
619For example, in a commit history like this:
620+
621----------------------------------------------------------------
622
623 ---1----2----4----7
624 \ \
625 3----5----6----8---
626
627----------------------------------------------------------------
628+
629where the numbers denote the order of commit timestamps, `git
630rev-list` and friends with `--date-order` show the commits in the
631timestamp order: 8 7 6 5 4 3 2 1.
632+
633With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
6343 1); some older commits are shown before newer ones in order to
635avoid showing the commits from two parallel development track mixed
636together.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100637
638--reverse::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100639 Output the commits in reverse order.
Jason St. John4528aa12013-11-14 20:34:01 -0500640 Cannot be combined with `--walk-reflogs`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100641
642Object Traversal
643~~~~~~~~~~~~~~~~
644
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100645These options are mostly targeted for packing of Git repositories.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100646
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800647ifdef::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100648--objects::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100649 Print the object IDs of any object referenced by the listed
Jason St. John4528aa12013-11-14 20:34:01 -0500650 commits. `--objects foo ^bar` thus means ``send me
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100651 all object IDs which I need to download if I have the commit
Jason St. John4528aa12013-11-14 20:34:01 -0500652 object _bar_ but not _foo_''.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100653
654--objects-edge::
Jason St. John4528aa12013-11-14 20:34:01 -0500655 Similar to `--objects`, but also print the IDs of excluded
656 commits prefixed with a ``-'' character. This is used by
brian m. carlson82976432014-12-20 22:51:11 +0000657 linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100658 objects in deltified form based on objects contained in these
659 excluded commits to reduce network traffic.
660
brian m. carlson1684c1b2014-12-24 23:05:39 +0000661--objects-edge-aggressive::
662 Similar to `--objects-edge`, but it tries harder to find excluded
brian m. carlson2dacf262014-12-24 23:05:40 +0000663 commits at the cost of increased time. This is used instead of
664 `--objects-edge` to build ``thin'' packs for shallow repositories.
brian m. carlson1684c1b2014-12-24 23:05:39 +0000665
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800666--indexed-objects::
667 Pretend as if all trees and blobs used by the index are listed
668 on the command line. Note that you probably want to use
669 `--objects`, too.
670
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100671--unpacked::
Jason St. John4528aa12013-11-14 20:34:01 -0500672 Only useful with `--objects`; print the object IDs that are not
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100673 in packs.
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800674endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100675
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700676--no-walk[=(sorted|unsorted)]::
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700677 Only show the given commits, but do not traverse their ancestors.
678 This has no effect if a range is specified. If the argument
Jason St. John19d6eb42013-11-14 20:34:02 -0500679 `unsorted` is given, the commits are shown in the order they were
Jason St. John4528aa12013-11-14 20:34:01 -0500680 given on the command line. Otherwise (if `sorted` or no argument
Jason St. John19d6eb42013-11-14 20:34:02 -0500681 was given), the commits are shown in reverse chronological order
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700682 by commit time.
Dongcan Jiang695985f2015-03-11 10:13:02 +0800683 Cannot be combined with `--graph`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100684
685--do-walk::
Jason St. John4528aa12013-11-14 20:34:01 -0500686 Overrides a previous `--no-walk`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100687
688Commit Formatting
689~~~~~~~~~~~~~~~~~
690
691ifdef::git-rev-list[]
692Using these options, linkgit:git-rev-list[1] will act similar to the
693more specialized family of commit log tools: linkgit:git-log[1],
694linkgit:git-show[1], and linkgit:git-whatchanged[1]
695endif::git-rev-list[]
696
697include::pretty-options.txt[]
698
699--relative-date::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100700 Synonym for `--date=relative`.
701
Beat Bolli466fb672014-08-29 18:58:42 +0200702--date=(relative|local|default|iso|iso-strict|rfc|short|raw)::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100703 Only takes effect for dates shown in human-readable format, such
Jason St. John4528aa12013-11-14 20:34:01 -0500704 as when using `--pretty`. `log.date` config variable sets a default
Jason St. John19d6eb42013-11-14 20:34:02 -0500705 value for the log command's `--date` option.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100706+
707`--date=relative` shows dates relative to the current time,
Jason St. John4528aa12013-11-14 20:34:01 -0500708e.g. ``2 hours ago''.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100709+
Jason St. John0ffa1542013-11-08 19:48:52 -0500710`--date=local` shows timestamps in user's local time zone.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100711+
Beat Bolli466fb672014-08-29 18:58:42 +0200712`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
713The differences to the strict ISO 8601 format are:
714
715 - a space instead of the `T` date/time delimiter
716 - a space between time and time zone
717 - no colon between hours and minutes of the time zone
718
719+
720`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
721ISO 8601 format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100722+
723`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Jason St. John19d6eb42013-11-14 20:34:02 -0500724format, often found in email messages.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100725+
Jason St. John19d6eb42013-11-14 20:34:02 -0500726`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100727+
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100728`--date=raw` shows the date in the internal raw Git format `%s %z` format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100729+
Jason St. John0ffa1542013-11-08 19:48:52 -0500730`--date=default` shows timestamps in the original time zone
Michael J Gruberf98fd432011-03-08 09:31:26 +0100731(either committer's or author's).
732
733ifdef::git-rev-list[]
734--header::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100735 Print the contents of the commit in raw-format; each record is
736 separated with a NUL character.
737endif::git-rev-list[]
738
739--parents::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100740 Print also the parents of the commit (in the form "commit parent...").
741 Also enables parent rewriting, see 'History Simplification' below.
742
743--children::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100744 Print also the children of the commit (in the form "commit child...").
745 Also enables parent rewriting, see 'History Simplification' below.
746
747ifdef::git-rev-list[]
748--timestamp::
749 Print the raw commit timestamp.
750endif::git-rev-list[]
751
752--left-right::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100753 Mark which side of a symmetric diff a commit is reachable from.
754 Commits from the left side are prefixed with `<` and those from
755 the right with `>`. If combined with `--boundary`, those
756 commits are prefixed with `-`.
757+
758For example, if you have this topology:
759+
760-----------------------------------------------------------------------
761 y---b---b branch B
762 / \ /
763 / .
764 / / \
765 o---x---a---a branch A
766-----------------------------------------------------------------------
767+
768you would get an output like this:
769+
770-----------------------------------------------------------------------
771 $ git rev-list --left-right --boundary --pretty=oneline A...B
772
773 >bbbbbbb... 3rd on b
774 >bbbbbbb... 2nd on b
775 <aaaaaaa... 3rd on a
776 <aaaaaaa... 2nd on a
777 -yyyyyyy... 1st on b
778 -xxxxxxx... 1st on a
779-----------------------------------------------------------------------
780
781--graph::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100782 Draw a text-based graphical representation of the commit history
783 on the left hand side of the output. This may cause extra lines
784 to be printed in between commits, in order for the graph history
785 to be drawn properly.
Dongcan Jiang695985f2015-03-11 10:13:02 +0800786 Cannot be combined with `--no-walk`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100787+
788This enables parent rewriting, see 'History Simplification' below.
789+
Jason St. John4528aa12013-11-14 20:34:01 -0500790This implies the `--topo-order` option by default, but the
791`--date-order` option may also be specified.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100792
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700793--show-linear-break[=<barrier>]::
794 When --graph is not used, all history branches are flattened
795 which can make it hard to see that the two consecutive commits
796 do not belong to a linear branch. This option puts a barrier
797 in between them in that case. If `<barrier>` is specified, it
798 is the string that will be shown instead of the default one.
799
Michael J Gruberf98fd432011-03-08 09:31:26 +0100800ifdef::git-rev-list[]
801--count::
802 Print a number stating how many commits would have been
803 listed, and suppress all other output. When used together
Jason St. John4528aa12013-11-14 20:34:01 -0500804 with `--left-right`, instead print the counts for left and
Michael J Gruberb388e142011-04-26 10:24:29 +0200805 right commits, separated by a tab. When used together with
Jason St. John4528aa12013-11-14 20:34:01 -0500806 `--cherry-mark`, omit patch equivalent commits from these
Michael J Gruberb388e142011-04-26 10:24:29 +0200807 counts and print the count for equivalent commits separated
808 by a tab.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100809endif::git-rev-list[]
810
Michael J Gruberf98fd432011-03-08 09:31:26 +0100811ifndef::git-rev-list[]
812Diff Formatting
813~~~~~~~~~~~~~~~
814
Jason St. John19d6eb42013-11-14 20:34:02 -0500815Listed below are options that control the formatting of diff output.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100816Some of them are specific to linkgit:git-rev-list[1], however other diff
817options may be given. See linkgit:git-diff-files[1] for more options.
818
819-c::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100820 With this option, diff output for a merge commit
821 shows the differences from each of the parents to the merge result
822 simultaneously instead of showing pairwise diff between a parent
823 and the result one at a time. Furthermore, it lists only files
824 which were modified from all parents.
825
826--cc::
Jason St. John4528aa12013-11-14 20:34:01 -0500827 This flag implies the `-c` option and further compresses the
Michael J Gruberf98fd432011-03-08 09:31:26 +0100828 patch output by omitting uninteresting hunks whose contents in
829 the parents have only two variants and the merge result picks
830 one of them without modification.
831
832-m::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100833 This flag makes the merge commits show the full diff like
834 regular commits; for each merge parent, a separate log entry
835 and diff is generated. An exception is that only diff against
Jason St. John4528aa12013-11-14 20:34:01 -0500836 the first parent is shown when `--first-parent` option is given;
Michael J Gruberf98fd432011-03-08 09:31:26 +0100837 in that case, the output represents the changes the merge
838 brought _into_ the then-current branch.
839
840-r::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100841 Show recursive diffs.
842
843-t::
Jason St. John4528aa12013-11-14 20:34:01 -0500844 Show the tree objects in the diff output. This implies `-r`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100845endif::git-rev-list[]