blob: 4f009d44240e3725e25bc8a9a3acd999d69cc487 [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`).
Jeff King2aea7a52015-08-23 13:56:40 -040061ifndef::git-rev-list[]
Nguyễn Thái Ngọc Duy38cfe912012-09-29 11:41:29 +070062+
Michael J Gruber7348cde2015-04-17 16:28:56 +020063When `--show-notes` is in effect, the message from the notes is
64matched as if it were part of the log message.
Jeff King2aea7a52015-08-23 13:56:40 -040065endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010066
Mikael Magnusson7756ba72008-11-02 19:32:46 +010067--all-match::
Jason St. John4528aa12013-11-14 20:34:01 -050068 Limit the commits output to ones that match all given `--grep`,
Junio C Hamanoa23e3132012-09-13 18:54:30 -070069 instead of ones that match at least one.
Mikael Magnusson7756ba72008-11-02 19:32:46 +010070
Christoph Junghans22dfa8a2015-01-12 18:33:32 -070071--invert-grep::
72 Limit the commits output to ones with log message that do not
73 match the pattern specified with `--grep=<pattern>`.
74
Stephan Beyer32402402008-06-08 03:36:09 +020075-i::
76--regexp-ignore-case::
Jason St. John19d6eb42013-11-14 20:34:02 -050077 Match the regular expression limiting patterns without regard to letter
78 case.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010079
Junio C Hamano727b6fc2012-10-03 15:01:34 -070080--basic-regexp::
Junio C Hamano727b6fc2012-10-03 15:01:34 -070081 Consider the limiting patterns to be basic regular expressions;
82 this is the default.
83
Stephan Beyer32402402008-06-08 03:36:09 +020084-E::
85--extended-regexp::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010086 Consider the limiting patterns to be extended regular expressions
87 instead of the default basic regular expressions.
88
Stephan Beyer32402402008-06-08 03:36:09 +020089-F::
90--fixed-strings::
Jakub Narebskidc1c0ff2008-02-26 13:22:05 +010091 Consider the limiting patterns to be fixed strings (don't interpret
92 pattern as a regular expression).
93
Junio C Hamano727b6fc2012-10-03 15:01:34 -070094--perl-regexp::
Jason St. John19d6eb42013-11-14 20:34:02 -050095 Consider the limiting patterns to be Perl-compatible regular expressions.
Junio C Hamano727b6fc2012-10-03 15:01:34 -070096 Requires libpcre to be compiled in.
97
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010098--remove-empty::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +010099 Stop when a given path disappears from the tree.
100
SZEDER Gábor26574202009-07-13 17:11:44 +0200101--merges::
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100102 Print only merge commits. This is exactly the same as `--min-parents=2`.
SZEDER Gábor26574202009-07-13 17:11:44 +0200103
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100104--no-merges::
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100105 Do not print commits with more than one parent. This is
106 exactly the same as `--max-parents=1`.
107
108--min-parents=<number>::
109--max-parents=<number>::
110--no-min-parents::
111--no-max-parents::
Torstein Hegge5104d212013-08-02 20:40:07 +0200112 Show only commits which have at least (or at most) that many parent
Michael J Gruber6a6ebde2011-03-23 10:38:51 +0100113 commits. In particular, `--max-parents=1` is the same as `--no-merges`,
114 `--min-parents=2` is the same as `--merges`. `--max-parents=0`
115 gives 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).
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100120
121--first-parent::
122 Follow only the first parent commit upon seeing a merge
123 commit. This option can give a better overview when
124 viewing the evolution of a particular topic branch,
125 because merges into a topic branch tend to be only about
126 adjusting to updated upstream from time to time, and
127 this option allows you to ignore the individual commits
Kevin Daudtf88851c2015-03-19 23:14:08 +0100128 brought in to your history by such a merge. Cannot be
129 combined with --bisect.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100130
131--not::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100132 Reverses the meaning of the '{caret}' prefix (or lack thereof)
Jason St. John4528aa12013-11-14 20:34:01 -0500133 for all following revision specifiers, up to the next `--not`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100134
135--all::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500136 Pretend as if all the refs in `refs/` are listed on the
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100137 command line as '<commit>'.
138
Štěpán Němec62b46982010-10-08 19:31:15 +0200139--branches[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500140 Pretend as if all the refs in `refs/heads` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200141 on the command line as '<commit>'. If '<pattern>' is given, limit
Ilari Liusvaarab09fe972010-01-20 11:48:26 +0200142 branches to ones matching given shell glob. If pattern lacks '?',
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100143 '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000144
Štěpán Němec62b46982010-10-08 19:31:15 +0200145--tags[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500146 Pretend as if all the refs in `refs/tags` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200147 on the command line as '<commit>'. If '<pattern>' is given, limit
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100148 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
149 or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000150
Štěpán Němec62b46982010-10-08 19:31:15 +0200151--remotes[=<pattern>]::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500152 Pretend as if all the refs in `refs/remotes` are listed
Štěpán Němec62b46982010-10-08 19:31:15 +0200153 on the command line as '<commit>'. If '<pattern>' is given, limit
Matthieu Moy0e615b22010-11-02 16:31:20 +0100154 remote-tracking branches to ones matching given shell glob.
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100155 If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Mark Burtonc2e63852008-11-17 21:03:59 +0000156
Štěpán Němec62b46982010-10-08 19:31:15 +0200157--glob=<glob-pattern>::
158 Pretend as if all the refs matching shell glob '<glob-pattern>'
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200159 are listed on the command line as '<commit>'. Leading 'refs/',
Carlos Martín Nietoe34bb2e2012-02-28 16:35:48 +0100160 is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
161 or '[', '/{asterisk}' at the end is implied.
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200162
Johannes Sixt574d3702013-09-02 22:11:26 +0200163--exclude=<glob-pattern>::
164
165 Do not include refs matching '<glob-pattern>' that the next `--all`,
166 `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
167 consider. Repetitions of this option accumulate exclusion patterns
168 up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
169 `--glob` option (other options or arguments do not clear
Thomas Ackermannf745acb2014-11-03 21:37:07 +0100170 accumulated patterns).
Johannes Sixt574d3702013-09-02 22:11:26 +0200171+
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
Jeff King41d018d2014-10-15 18:43:28 -0400178--reflog::
179 Pretend as if all objects mentioned by reflogs are listed on the
180 command line as `<commit>`.
181
Junio C Hamanocc243c32011-05-18 18:08:09 -0700182--ignore-missing::
Junio C Hamanocc243c32011-05-18 18:08:09 -0700183 Upon seeing an invalid object name in the input, pretend as if
184 the bad input was not given.
Ilari Liusvaarad08bae72010-01-20 11:48:25 +0200185
Christian Couderaf06e932009-11-24 07:54:44 +0100186ifndef::git-rev-list[]
187--bisect::
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500188 Pretend as if the bad bisection ref `refs/bisect/bad`
Christian Couderaf06e932009-11-24 07:54:44 +0100189 was listed and as if it was followed by `--not` and the good
Jeff Kingcc1b8d82010-02-17 20:16:20 -0500190 bisection refs `refs/bisect/good-*` on the command
Kevin Daudtf88851c2015-03-19 23:14:08 +0100191 line. Cannot be combined with --first-parent.
Christian Couderaf06e932009-11-24 07:54:44 +0100192endif::git-rev-list[]
193
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100194--stdin::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100195 In addition to the '<commit>' listed on the command
Junio C Hamano60da8b12009-11-20 02:50:21 -0800196 line, read them from the standard input. If a '--' separator is
197 seen, stop reading commits and start reading paths to limit the
198 result.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100199
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800200ifdef::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100201--quiet::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100202 Don't print anything to standard output. This form
203 is primarily meant to allow the caller to
204 test the exit status to see if a range of objects is fully
205 connected (or not). It is faster than redirecting stdout
Jason St. John4528aa12013-11-14 20:34:01 -0500206 to `/dev/null` as the output does not have to be formatted.
Junio C Hamanoadf60f12008-06-03 23:56:56 -0700207endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100208
Michael J Grubercb56e302011-03-07 13:31:41 +0100209--cherry-mark::
Michael J Grubercb56e302011-03-07 13:31:41 +0100210 Like `--cherry-pick` (see below) but mark equivalent commits
211 with `=` rather than omitting them, and inequivalent ones with `+`.
212
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100213--cherry-pick::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100214 Omit any commit that introduces the same change as
Jason St. John4528aa12013-11-14 20:34:01 -0500215 another commit on the ``other side'' when the set of
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100216 commits 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 Hamano3add01b2011-04-01 11:04:46 -0700220`--left-right` (see the example below in the description of
Jason St. John19d6eb42013-11-14 20:34:02 -0500221the `--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
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100224excluded from the output.
225
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100226--left-only::
227--right-only::
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100228 List only commits on the respective side of a symmetric range,
229 i.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
Jeff King6cf378f2012-04-26 04:51:57 -0400234`A`. In other words, this lists the `+` commits from `git cherry A B`.
Michael J Gruber59c8afd2011-02-21 17:09:12 +0100235More precisely, `--cherry-pick --right-only --no-merges` gives the exact
236list.
237
Michael J Gruber94f605e2011-03-07 13:31:42 +0100238--cherry::
Michael J Gruber94f605e2011-03-07 13:31:42 +0100239 A synonym for `--right-only --cherry-mark --no-merges`; useful to
240 limit the output to the commits on our side and mark those that
241 have 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
Stephan Beyer32402402008-06-08 03:36:09 +0200245-g::
246--walk-reflogs::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100247 Instead of walking the commit ancestry chain, walk
248 reflog entries from the most recent one to older ones.
249 When this option is used you cannot specify commits to
250 exclude (that is, '{caret}commit', 'commit1..commit2',
Justin Lebara58088a2014-03-31 15:11:44 -0700251 and 'commit1\...commit2' notations cannot be used).
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100252+
Jason St. John4528aa12013-11-14 20:34:01 -0500253With `--pretty` format other than `oneline` (for obvious reasons),
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100254this 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
Thomas Rast18a21972008-08-10 15:04:34 +0200257'commit@\{now}', output also uses 'commit@\{timestamp}' notation
Jason St. John4528aa12013-11-14 20:34:01 -0500258instead. Under `--pretty=oneline`, the commit message is
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100259prefixed with this information on the same line.
Jason St. John4528aa12013-11-14 20:34:01 -0500260This option cannot be combined with `--reverse`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100261See also linkgit:git-reflog[1].
262
263--merge::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100264 After a failed merge, show refs that touch files having a
265 conflict and don't exist on all heads to merge.
266
267--boundary::
Kevin Braceye32db662013-05-16 18:32:33 +0300268 Output excluded boundary commits. Boundary commits are
269 prefixed with `-`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100270
Vicent Martiaa329392013-12-21 09:00:12 -0500271ifdef::git-rev-list[]
272--use-bitmap-index::
273
274 Try to speed up the traversal using the pack bitmap index (if
275 one is available). Note that when traversing with `--objects`,
276 trees and blobs will not have their associated path printed.
277endif::git-rev-list[]
278
Thomas Rast70d98952008-08-12 01:55:36 +0200279--
280
281History Simplification
282~~~~~~~~~~~~~~~~~~~~~~
283
Santi Béjar7bc25082008-11-12 11:51:28 +0100284Sometimes 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>::
Santi Béjar7bc25082008-11-12 11:51:28 +0100292 Commits modifying the given <paths> are selected.
293
294--simplify-by-decoration::
Santi Béjar7bc25082008-11-12 11:51:28 +0100295 Commits 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::
Santi Béjar7bc25082008-11-12 11:51:28 +0100302 Simplifies the history to the simplest history explaining the
303 final state of the tree. Simplest because it prunes some side
304 branches if the end result is the same (i.e. merging branches
305 with the same content)
306
307--full-history::
Jack Nageldf6b0ca2011-07-21 20:33:15 -0500308 Same as the default mode, but does not prune some history.
Santi Béjar7bc25082008-11-12 11:51:28 +0100309
310--dense::
Santi Béjar7bc25082008-11-12 11:51:28 +0100311 Only the selected commits are shown, plus some to have a
312 meaningful history.
313
314--sparse::
Santi Béjar7bc25082008-11-12 11:51:28 +0100315 All commits in the simplified history are shown.
316
317--simplify-merges::
Jason St. John4528aa12013-11-14 20:34:01 -0500318 Additional option to `--full-history` to remove some needless
Santi Béjar7bc25082008-11-12 11:51:28 +0100319 merges from the resulting history, as there are no selected
320 commits contributing to this merge.
321
Johan Herland57456ef2010-06-04 01:17:35 +0200322--ancestry-path::
Johan Herland57456ef2010-06-04 01:17:35 +0200323 When given a range of commits to display (e.g. 'commit1..commit2'
324 or 'commit2 {caret}commit1'), only display commits that exist
325 directly on the ancestry chain between the 'commit1' and
326 'commit2', i.e. commits that are both descendants of 'commit1',
327 and ancestors of 'commit2'.
328
Santi Béjar7bc25082008-11-12 11:51:28 +0100329A more detailed explanation follows.
Thomas Rast70d98952008-08-12 01:55:36 +0200330
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-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300339 .-A---M---N---O---P---Q
340 / / / / / /
341 I B C D E Y
342 \ / / / / /
343 `-------------' X
Thomas Rast70d98952008-08-12 01:55:36 +0200344-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300345The horizontal line of history A---Q is taken to be the first parent of
Thomas Rast70d98952008-08-12 01:55:36 +0200346each merge. The commits are:
347
348* `I` is the initial commit, in which `foo` exists with contents
Jason St. John4528aa12013-11-14 20:34:01 -0500349 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Thomas Rast70d98952008-08-12 01:55:36 +0200350 commits are compared to an empty tree, so `I` is !TREESAME.
351
Jason St. John4528aa12013-11-14 20:34:01 -0500352* In `A`, `foo` contains just ``foo''.
Thomas Rast70d98952008-08-12 01:55:36 +0200353
354* `B` contains the same change as `A`. Its merge `M` is trivial and
355 hence TREESAME to all parents.
356
Jason St. John4528aa12013-11-14 20:34:01 -0500357* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Thomas Rast70d98952008-08-12 01:55:36 +0200358 so it is not TREESAME to any parent.
359
Jason St. John4528aa12013-11-14 20:34:01 -0500360* `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.
Thomas Rast70d98952008-08-12 01:55:36 +0200362
Jason St. John4528aa12013-11-14 20:34:01 -0500363* `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`.
Thomas Rast70d98952008-08-12 01:55:36 +0200365
Ondřej Bílka17b83d72013-07-22 23:02:23 +0200366* `X` is an independent root commit that added a new file `side`, and `Y`
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300367 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`.
369
Jason St. John4528aa12013-11-14 20:34:01 -0500370`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
Thomas Rast70d98952008-08-12 01:55:36 +0200373are available.
374
375Default mode::
Thomas Rast70d98952008-08-12 01:55:36 +0200376 Commits are included if they are not TREESAME to any parent
Jason St. John4528aa12013-11-14 20:34:01 -0500377 (though this can be changed, see `--sparse` below). If the
Thomas Rast70d98952008-08-12 01:55:36 +0200378 commit was a merge, and it was TREESAME to one parent, follow
379 only that parent. (Even if there are several TREESAME
380 parents, follow only one of them.) Otherwise, follow all
381 parents.
382+
383This results in:
384+
385-----------------------------------------------------------------------
386 .-A---N---O
Johan Herlandf70d0582010-06-04 01:17:33 +0200387 / / /
Thomas Rast70d98952008-08-12 01:55:36 +0200388 I---------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+
Jason St. John4528aa12013-11-14 20:34:01 -0500396Parent/child relations are only visible with `--parents`, but that does
Thomas Rast70d98952008-08-12 01:55:36 +0200397not affect the commits selected in default mode, so we have shown the
398parent lines.
399
400--full-history without parent rewriting::
Thomas Rast70d98952008-08-12 01:55:36 +0200401 This mode differs from the default in one point: always follow
402 all parents of a merge, even if it is TREESAME to one of them.
403 Even if more than one side of the merge has commits that are
404 included, this does not imply that the merge itself is! In
405 the example, we get
406+
407-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300408 I A B N D O P Q
Thomas Rast70d98952008-08-12 01:55:36 +0200409-----------------------------------------------------------------------
410+
Kevin Braceyd0af6632013-05-16 18:32:34 +0300411`M` was excluded because it is TREESAME to both parents. `E`,
Thomas Rast70d98952008-08-12 01:55:36 +0200412`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::
Thomas Rast70d98952008-08-12 01:55:36 +0200420 Ordinary commits are only included if they are !TREESAME
Jason St. John4528aa12013-11-14 20:34:01 -0500421 (though this can be changed, see `--sparse` below).
Thomas Rast70d98952008-08-12 01:55:36 +0200422+
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-----------------------------------------------------------------------
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300428 .-A---M---N---O---P---Q
Thomas Rast70d98952008-08-12 01:55:36 +0200429 / / / / /
430 I B / D /
431 \ / / / /
432 `-------------'
433-----------------------------------------------------------------------
434+
Jason St. John4528aa12013-11-14 20:34:01 -0500435Compare to `--full-history` without rewriting above. Note that `E`
Thomas Rast70d98952008-08-12 01:55:36 +0200436was 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
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300438`N`, and `X`, `Y` and `Q`.
Thomas Rast70d98952008-08-12 01:55:36 +0200439
440In addition to the above settings, you can change whether TREESAME
441affects inclusion:
442
Stephan Beyer32402402008-06-08 03:36:09 +0200443--dense::
Thomas Rast70d98952008-08-12 01:55:36 +0200444 Commits that are walked are included if they are not TREESAME
445 to any parent.
446
Stephan Beyer32402402008-06-08 03:36:09 +0200447--sparse::
Thomas Rast70d98952008-08-12 01:55:36 +0200448 All commits that are walked are included.
449+
Jason St. John4528aa12013-11-14 20:34:01 -0500450Note that without `--full-history`, this still simplifies merges: if
Thomas Rast70d98952008-08-12 01:55:36 +0200451one of the parents is TREESAME, we follow only that one, so the other
452sides of the merge are never walked.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100453
Thomas Rastd266a982008-08-12 01:55:37 +0200454--simplify-merges::
Thomas Rastd266a982008-08-12 01:55:37 +0200455 First, build a history graph in the same way that
Jason St. John4528aa12013-11-14 20:34:01 -0500456 `--full-history` with parent rewriting does (see above).
Thomas Rastd266a982008-08-12 01:55:37 +0200457+
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
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300465 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.
Thomas Rastd266a982008-08-12 01:55:37 +0200468+
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
Jason St. John4528aa12013-11-14 20:34:01 -0500475`--full-history` with parent rewriting. The example turns into:
Thomas Rastd266a982008-08-12 01:55:37 +0200476+
477-----------------------------------------------------------------------
478 .-A---M---N---O
479 / / /
480 I B D
481 \ / /
482 `---------'
483-----------------------------------------------------------------------
484+
Jason St. John19d6eb42013-11-14 20:34:02 -0500485Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Thomas Rastd266a982008-08-12 01:55:37 +0200486+
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.
Kevin Bracey143f1ea2013-05-16 18:32:37 +0300493+
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.
Thomas Rastd266a982008-08-12 01:55:37 +0200497--
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100498
Johan Herland57456ef2010-06-04 01:17:35 +0200499Finally, there is a fifth simplification mode available:
500
501--ancestry-path::
Johan Herland57456ef2010-06-04 01:17:35 +0200502 Limit the displayed commits to those directly on the ancestry
Jason St. John4528aa12013-11-14 20:34:01 -0500503 chain between the ``from'' and ``to'' commits in the given commit
504 range. I.e. only display commits that are ancestor of the ``to''
Jason St. John19d6eb42013-11-14 20:34:02 -0500505 commit and descendants of the ``from'' commit.
Johan Herland57456ef2010-06-04 01:17:35 +0200506+
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 / \
514 A-------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
Jason St. John4528aa12013-11-14 20:34:01 -0500520that ``what does `M` have that did not exist in `D`''. The result in this
Johan Herland57456ef2010-06-04 01:17:35 +0200521example 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.
Jason St. John4528aa12013-11-14 20:34:01 -0500527excluding `C` and `K`. This is exactly what the `--ancestry-path`
Johan Herland57456ef2010-06-04 01:17:35 +0200528option does. Applied to the 'D..M' range, it results in:
529+
530-----------------------------------------------------------------------
531 E-------F
532 \ \
533 G---H---I---J
534 \
535 L--M
536-----------------------------------------------------------------------
537
Jason St. John4528aa12013-11-14 20:34:01 -0500538The `--simplify-by-decoration` option allows you to view only the
Nanako Shiraishi3fcfd662008-11-10 18:58:17 +0900539big 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
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100546ifdef::git-rev-list[]
Thomas Rast70d98952008-08-12 01:55:36 +0200547Bisection Helpers
548~~~~~~~~~~~~~~~~~
549
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100550--bisect::
Jason St. John4528aa12013-11-14 20:34:01 -0500551 Limit output to the one commit object which is roughly halfway between
552 included and excluded commits. Note that the bad bisection ref
553 `refs/bisect/bad` is added to the included commits (if it
554 exists) and the good bisection refs `refs/bisect/good-*` are
555 added to the excluded commits (if they exist). Thus, supposing there
556 are no refs in `refs/bisect/`, if
557+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100558-----------------------------------------------------------------------
Christian Couder6514aa32008-11-09 14:46:35 +0100559 $ git rev-list --bisect foo ^bar ^baz
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100560-----------------------------------------------------------------------
Jason St. John4528aa12013-11-14 20:34:01 -0500561+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100562outputs 'midpoint', the output of the two commands
Jason St. John4528aa12013-11-14 20:34:01 -0500563+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100564-----------------------------------------------------------------------
Christian Couder6514aa32008-11-09 14:46:35 +0100565 $ git rev-list foo ^midpoint
566 $ git rev-list midpoint ^bar ^baz
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100567-----------------------------------------------------------------------
Jason St. John4528aa12013-11-14 20:34:01 -0500568+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100569would 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
Kevin Daudtf88851c2015-03-19 23:14:08 +0100572one. Cannot be combined with --first-parent.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100573
574--bisect-vars::
Jason St. John4528aa12013-11-14 20:34:01 -0500575 This calculates the same as `--bisect`, except that refs in
576 `refs/bisect/` are not used, and except that this outputs
577 text ready to be eval'ed by the shell. These lines will assign the
578 name of the midpoint revision to the variable `bisect_rev`, and the
579 expected number of commits to be tested after `bisect_rev` is tested
580 to `bisect_nr`, the expected number of commits to be tested if
581 `bisect_rev` turns out to be good to `bisect_good`, the expected
582 number 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`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100585
586--bisect-all::
Jason St. John4528aa12013-11-14 20:34:01 -0500587 This outputs all the commit objects between the included and excluded
588 commits, ordered by their distance to the included and excluded
589 commits. Refs in `refs/bisect/` are not used. The farthest
590 from them is displayed first. (This is the only one displayed by
591 `--bisect`.)
Christian Couder3d2d4f92009-03-07 13:37:24 +0100592+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100593This 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).
Christian Couder3d2d4f92009-03-07 13:37:24 +0100596+
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100597This 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
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100602
603Commit Ordering
604~~~~~~~~~~~~~~~
605
606By default, the commits are shown in reverse chronological order.
607
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100608--date-order::
Junio C Hamano3f0350c2012-08-15 13:02:48 -0700609 Show no parents before all of its children are shown, but
610 otherwise show commits in the commit timestamp order.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100611
Junio C Hamano81c6b382013-06-07 10:35:54 -0700612--author-date-order::
613 Show no parents before all of its children are shown, but
614 otherwise show commits in the author timestamp order.
615
Junio C Hamano3f0350c2012-08-15 13:02:48 -0700616--topo-order::
617 Show no parents before all of its children are shown, and
618 avoid showing commits on multiple lines of history
619 intermixed.
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.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100639
640--reverse::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100641 Output the commits in reverse order.
Jason St. John4528aa12013-11-14 20:34:01 -0500642 Cannot be combined with `--walk-reflogs`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100643
644Object Traversal
645~~~~~~~~~~~~~~~~
646
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100647These options are mostly targeted for packing of Git repositories.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100648
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800649ifdef::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100650--objects::
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100651 Print the object IDs of any object referenced by the listed
Jason St. John4528aa12013-11-14 20:34:01 -0500652 commits. `--objects foo ^bar` thus means ``send me
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100653 all object IDs which I need to download if I have the commit
Jason St. John4528aa12013-11-14 20:34:01 -0500654 object _bar_ but not _foo_''.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100655
656--objects-edge::
Jason St. John4528aa12013-11-14 20:34:01 -0500657 Similar to `--objects`, but also print the IDs of excluded
658 commits prefixed with a ``-'' character. This is used by
brian m. carlson82976432014-12-20 22:51:11 +0000659 linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100660 objects in deltified form based on objects contained in these
661 excluded commits to reduce network traffic.
662
brian m. carlson1684c1b2014-12-24 23:05:39 +0000663--objects-edge-aggressive::
664 Similar to `--objects-edge`, but it tries harder to find excluded
brian m. carlson2dacf262014-12-24 23:05:40 +0000665 commits at the cost of increased time. This is used instead of
666 `--objects-edge` to build ``thin'' packs for shallow repositories.
brian m. carlson1684c1b2014-12-24 23:05:39 +0000667
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800668--indexed-objects::
669 Pretend as if all trees and blobs used by the index are listed
670 on the command line. Note that you probably want to use
671 `--objects`, too.
672
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100673--unpacked::
Jason St. John4528aa12013-11-14 20:34:01 -0500674 Only useful with `--objects`; print the object IDs that are not
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100675 in packs.
Junio C Hamano3cab02d2015-01-23 11:49:05 -0800676endif::git-rev-list[]
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100677
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700678--no-walk[=(sorted|unsorted)]::
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700679 Only show the given commits, but do not traverse their ancestors.
680 This has no effect if a range is specified. If the argument
Jason St. John19d6eb42013-11-14 20:34:02 -0500681 `unsorted` is given, the commits are shown in the order they were
Jason St. John4528aa12013-11-14 20:34:01 -0500682 given on the command line. Otherwise (if `sorted` or no argument
Jason St. John19d6eb42013-11-14 20:34:02 -0500683 was given), the commits are shown in reverse chronological order
Martin von Zweigbergkca92e592012-08-28 23:15:54 -0700684 by commit time.
Dongcan Jiang695985f2015-03-11 10:13:02 +0800685 Cannot be combined with `--graph`.
Miklos Vajnafdcf39e2008-01-18 23:58:57 +0100686
687--do-walk::
Jason St. John4528aa12013-11-14 20:34:01 -0500688 Overrides a previous `--no-walk`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100689
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::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100702 Synonym for `--date=relative`.
703
John Keeping4b1c5e12015-09-03 22:48:54 +0100704--date=<format>::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100705 Only takes effect for dates shown in human-readable format, such
Jason St. John4528aa12013-11-14 20:34:01 -0500706 as when using `--pretty`. `log.date` config variable sets a default
Jeff Kingadd00ba2015-09-03 22:48:59 +0100707 value for the log command's `--date` option. By default, dates
708 are shown in the original time zone (either committer's or
709 author's). If `-local` is appended to the format (e.g.,
710 `iso-local`), the user's local time zone is used instead.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100711+
712`--date=relative` shows dates relative to the current time,
Jeff Kingadd00ba2015-09-03 22:48:59 +0100713e.g. ``2 hours ago''. The `-local` option cannot be used with
714`--raw` or `--relative`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100715+
Jeff Kingadd00ba2015-09-03 22:48:59 +0100716`--date=local` is an alias for `--date=default-local`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100717+
Beat Bolli466fb672014-08-29 18:58:42 +0200718`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
719The differences to the strict ISO 8601 format are:
720
721 - a space instead of the `T` date/time delimiter
722 - a space between time and time zone
723 - no colon between hours and minutes of the time zone
724
725+
726`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
727ISO 8601 format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100728+
729`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Jason St. John19d6eb42013-11-14 20:34:02 -0500730format, often found in email messages.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100731+
Jason St. John19d6eb42013-11-14 20:34:02 -0500732`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100733+
Thomas Ackermann2de9b712013-01-21 20:17:53 +0100734`--date=raw` shows the date in the internal raw Git format `%s %z` format.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100735+
Jeff Kingaa1462c2015-06-25 12:55:45 -0400736`--date=format:...` feeds the format `...` to your system `strftime`.
737Use `--date=format:%c` to show the date in your system locale's
738preferred format. See the `strftime` manual for a complete list of
Jeff Kingadd00ba2015-09-03 22:48:59 +0100739format placeholders. When using `-local`, the correct syntax is
740`--date=format-local:...`.
Jeff Kingaa1462c2015-06-25 12:55:45 -0400741+
Jeff Kingadd00ba2015-09-03 22:48:59 +0100742`--date=default` is the default format, and is similar to
743`--date=rfc2822`, with a few exceptions:
744
745 - there is no comma after the day-of-week
746
747 - the time zone is omitted when the local time zone is used
Michael J Gruberf98fd432011-03-08 09:31:26 +0100748
749ifdef::git-rev-list[]
750--header::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100751 Print the contents of the commit in raw-format; each record is
752 separated with a NUL character.
753endif::git-rev-list[]
754
755--parents::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100756 Print also the parents of the commit (in the form "commit parent...").
757 Also enables parent rewriting, see 'History Simplification' below.
758
759--children::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100760 Print also the children of the commit (in the form "commit child...").
761 Also enables parent rewriting, see 'History Simplification' below.
762
763ifdef::git-rev-list[]
764--timestamp::
765 Print the raw commit timestamp.
766endif::git-rev-list[]
767
768--left-right::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100769 Mark which side of a symmetric diff a commit is reachable from.
770 Commits from the left side are prefixed with `<` and those from
771 the right with `>`. If combined with `--boundary`, those
772 commits are prefixed with `-`.
773+
774For example, if you have this topology:
775+
776-----------------------------------------------------------------------
777 y---b---b branch B
778 / \ /
779 / .
780 / / \
781 o---x---a---a branch A
782-----------------------------------------------------------------------
783+
784you would get an output like this:
785+
786-----------------------------------------------------------------------
787 $ git rev-list --left-right --boundary --pretty=oneline A...B
788
789 >bbbbbbb... 3rd on b
790 >bbbbbbb... 2nd on b
791 <aaaaaaa... 3rd on a
792 <aaaaaaa... 2nd on a
793 -yyyyyyy... 1st on b
794 -xxxxxxx... 1st on a
795-----------------------------------------------------------------------
796
797--graph::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100798 Draw a text-based graphical representation of the commit history
799 on the left hand side of the output. This may cause extra lines
800 to be printed in between commits, in order for the graph history
801 to be drawn properly.
Dongcan Jiang695985f2015-03-11 10:13:02 +0800802 Cannot be combined with `--no-walk`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100803+
804This enables parent rewriting, see 'History Simplification' below.
805+
Jason St. John4528aa12013-11-14 20:34:01 -0500806This implies the `--topo-order` option by default, but the
807`--date-order` option may also be specified.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100808
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +0700809--show-linear-break[=<barrier>]::
810 When --graph is not used, all history branches are flattened
811 which can make it hard to see that the two consecutive commits
812 do not belong to a linear branch. This option puts a barrier
813 in between them in that case. If `<barrier>` is specified, it
814 is the string that will be shown instead of the default one.
815
Michael J Gruberf98fd432011-03-08 09:31:26 +0100816ifdef::git-rev-list[]
817--count::
818 Print a number stating how many commits would have been
819 listed, and suppress all other output. When used together
Jason St. John4528aa12013-11-14 20:34:01 -0500820 with `--left-right`, instead print the counts for left and
Michael J Gruberb388e142011-04-26 10:24:29 +0200821 right commits, separated by a tab. When used together with
Jason St. John4528aa12013-11-14 20:34:01 -0500822 `--cherry-mark`, omit patch equivalent commits from these
Michael J Gruberb388e142011-04-26 10:24:29 +0200823 counts and print the count for equivalent commits separated
824 by a tab.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100825endif::git-rev-list[]
826
Michael J Gruberf98fd432011-03-08 09:31:26 +0100827ifndef::git-rev-list[]
828Diff Formatting
829~~~~~~~~~~~~~~~
830
Jason St. John19d6eb42013-11-14 20:34:02 -0500831Listed below are options that control the formatting of diff output.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100832Some of them are specific to linkgit:git-rev-list[1], however other diff
833options may be given. See linkgit:git-diff-files[1] for more options.
834
835-c::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100836 With this option, diff output for a merge commit
837 shows the differences from each of the parents to the merge result
838 simultaneously instead of showing pairwise diff between a parent
839 and the result one at a time. Furthermore, it lists only files
840 which were modified from all parents.
841
842--cc::
Jason St. John4528aa12013-11-14 20:34:01 -0500843 This flag implies the `-c` option and further compresses the
Michael J Gruberf98fd432011-03-08 09:31:26 +0100844 patch output by omitting uninteresting hunks whose contents in
845 the parents have only two variants and the merge result picks
846 one of them without modification.
847
848-m::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100849 This flag makes the merge commits show the full diff like
850 regular commits; for each merge parent, a separate log entry
851 and diff is generated. An exception is that only diff against
Jason St. John4528aa12013-11-14 20:34:01 -0500852 the first parent is shown when `--first-parent` option is given;
Michael J Gruberf98fd432011-03-08 09:31:26 +0100853 in that case, the output represents the changes the merge
854 brought _into_ the then-current branch.
855
856-r::
Michael J Gruberf98fd432011-03-08 09:31:26 +0100857 Show recursive diffs.
858
859-t::
Jason St. John4528aa12013-11-14 20:34:01 -0500860 Show the tree objects in the diff output. This implies `-r`.
Michael J Gruberf98fd432011-03-08 09:31:26 +0100861endif::git-rev-list[]