blob: a46f70c2b16c2c03f47ccb3444cffb491b68ed83 [file] [log] [blame]
Junio C Hamanob0e02952008-01-19 08:02:001Commit Limiting
2~~~~~~~~~~~~~~~
3
4Besides specifying a range of commits that should be listed using the
5special notations explained in the description, additional commit
Junio C Hamano8ce35d72012-09-18 22:30:426limiting may be applied.
7
8Using more options generally further limits the output (e.g.
9`--since=<date1>` limits to commits newer than `<date1>`, and using it
10with `--grep=<pattern>` further limits to commits whose log message
11has a line that matches `<pattern>`), unless otherwise noted.
12
13Note that these are applied before commit
14ordering and formatting options, such as `--reverse`.
Junio C Hamanob0e02952008-01-19 08:02:0015
16--
17
Junio C Hamano693e7092012-09-12 22:56:5318-<number>::
19-n <number>::
Junio C Hamanob4a9ede2009-04-08 07:36:3220--max-count=<number>::
Junio C Hamanoc5be4cc2011-03-09 07:20:4321Limit the number of commits to output.
Junio C Hamanob0e02952008-01-19 08:02:0022
Junio C Hamanob4a9ede2009-04-08 07:36:3223--skip=<number>::
Junio C Hamanob0e02952008-01-19 08:02:0024Skip 'number' commits before starting to show the commit output.
25
Junio C Hamanob4a9ede2009-04-08 07:36:3226--since=<date>::
27--after=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0028Show commits more recent than a specific date.
29
Junio C Hamanob4a9ede2009-04-08 07:36:3230--until=<date>::
31--before=<date>::
Junio C Hamanob0e02952008-01-19 08:02:0032Show commits older than a specific date.
33
Junio C Hamano4f1d8c42008-03-03 02:01:1634ifdef::git-rev-list[]
Junio C Hamanob4a9ede2009-04-08 07:36:3235--max-age=<timestamp>::
36--min-age=<timestamp>::
Junio C Hamanob0e02952008-01-19 08:02:0037Limit the commits output to specified time range.
Junio C Hamano4f1d8c42008-03-03 02:01:1638endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0039
Junio C Hamanob4a9ede2009-04-08 07:36:3240--author=<pattern>::
41--committer=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0042Limit the commits output to ones with author/committer
Junio C Hamano8ce35d72012-09-18 22:30:4243header lines that match the specified pattern (regular
44expression). With more than one `--author=<pattern>`,
45commits whose author matches any of the given patterns are
46chosen (similarly for multiple `--committer=<pattern>`).
Junio C Hamanob0e02952008-01-19 08:02:0047
Junio C Hamano9954ed72012-10-03 04:54:0048--grep-reflog=<pattern>::
Junio C Hamano9954ed72012-10-03 04:54:0049Limit the commits output to ones with reflog entries that
50match the specified pattern (regular expression). With
51more than one `--grep-reflog`, commits whose reflog message
52matches any of the given patterns are chosen. It is an
53error to use this option unless `--walk-reflogs` is in use.
54
Junio C Hamanob4a9ede2009-04-08 07:36:3255--grep=<pattern>::
Junio C Hamanob0e02952008-01-19 08:02:0056Limit the commits output to ones with log message that
Junio C Hamano8ce35d72012-09-18 22:30:4257matches the specified pattern (regular expression). With
58more than one `--grep=<pattern>`, commits whose message
59matches any of the given patterns are chosen (but see
60`--all-match`).
Junio C Hamano3891e252015-08-31 23:06:1361ifndef::git-rev-list[]
Junio C Hamano9954ed72012-10-03 04:54:0062+
Junio C Hamano8152abf2015-04-28 22:48:0263When `--show-notes` is in effect, the message from the notes is
64matched as if it were part of the log message.
Junio C Hamano3891e252015-08-31 23:06:1365endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0066
Junio C Hamanoaa17c7c2008-11-03 04:36:5867--all-match::
Junio C Hamanob73af6c2013-12-03 22:07:1168Limit the commits output to ones that match all given `--grep`,
Junio C Hamano8ce35d72012-09-18 22:30:4269instead of ones that match at least one.
Junio C Hamanoaa17c7c2008-11-03 04:36:5870
Junio C Hamano6bb32e62015-02-17 22:11:2671--invert-grep::
72Limit the commits output to ones with log message that do not
73match the pattern specified with `--grep=<pattern>`.
74
Junio C Hamanoeb415992008-06-08 22:49:4775-i::
76--regexp-ignore-case::
Junio C Hamanob73af6c2013-12-03 22:07:1177Match the regular expression limiting patterns without regard to letter
78case.
Junio C Hamanob0e02952008-01-19 08:02:0079
Junio C Hamanoa1295452012-11-13 22:32:0480--basic-regexp::
Junio C Hamanoa1295452012-11-13 22:32:0481Consider the limiting patterns to be basic regular expressions;
82this is the default.
83
Junio C Hamanoeb415992008-06-08 22:49:4784-E::
85--extended-regexp::
Junio C Hamanob0e02952008-01-19 08:02:0086Consider the limiting patterns to be extended regular expressions
87instead of the default basic regular expressions.
88
Junio C Hamanoeb415992008-06-08 22:49:4789-F::
90--fixed-strings::
Junio C Hamano24bc09a2008-02-28 00:27:4491Consider the limiting patterns to be fixed strings (don't interpret
92pattern as a regular expression).
93
Junio C Hamanoa1295452012-11-13 22:32:0494--perl-regexp::
Junio C Hamano222ed822017-06-02 06:24:0695Consider the limiting patterns to be Perl-compatible regular
96expressions.
97+
98Support for these types of regular expressions is an optional
99compile-time dependency. If Git wasn't compiled with support for them
100providing this option will cause it to die.
Junio C Hamanoa1295452012-11-13 22:32:04101
Junio C Hamanob0e02952008-01-19 08:02:00102--remove-empty::
Junio C Hamanob0e02952008-01-19 08:02:00103Stop when a given path disappears from the tree.
104
Junio C Hamano934e1782009-07-16 06:59:15105--merges::
Junio C Hamanof32ce262011-03-27 07:35:11106Print only merge commits. This is exactly the same as `--min-parents=2`.
Junio C Hamano934e1782009-07-16 06:59:15107
Junio C Hamanob0e02952008-01-19 08:02:00108--no-merges::
Junio C Hamanof32ce262011-03-27 07:35:11109Do not print commits with more than one parent. This is
110exactly the same as `--max-parents=1`.
111
112--min-parents=<number>::
113--max-parents=<number>::
114--no-min-parents::
115--no-max-parents::
Junio C Hamanoc5bb3b32013-08-05 22:43:36116Show only commits which have at least (or at most) that many parent
Junio C Hamanof32ce262011-03-27 07:35:11117commits. In particular, `--max-parents=1` is the same as `--no-merges`,
118`--min-parents=2` is the same as `--merges`. `--max-parents=0`
119gives all root commits and `--min-parents=3` all octopus merges.
120+
121`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
122again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
123parents) and `--max-parents=-1` (negative numbers denote no upper limit).
Junio C Hamanob0e02952008-01-19 08:02:00124
125--first-parent::
126Follow only the first parent commit upon seeing a merge
127commit. This option can give a better overview when
128viewing the evolution of a particular topic branch,
129because merges into a topic branch tend to be only about
130adjusting to updated upstream from time to time, and
131this option allows you to ignore the individual commits
Junio C Hamanoef57d1e2015-03-25 21:23:00132brought in to your history by such a merge. Cannot be
133combined with --bisect.
Junio C Hamanob0e02952008-01-19 08:02:00134
135--not::
Junio C Hamanob0e02952008-01-19 08:02:00136Reverses the meaning of the '{caret}' prefix (or lack thereof)
Junio C Hamanob73af6c2013-12-03 22:07:11137for all following revision specifiers, up to the next `--not`.
Junio C Hamanob0e02952008-01-19 08:02:00138
139--all::
Junio C Hamanoe89102f2017-02-15 23:18:15140Pretend as if all the refs in `refs/`, along with `HEAD`, are
141listed on the command line as '<commit>'.
Junio C Hamanob0e02952008-01-19 08:02:00142
Junio C Hamanod2179ef2010-10-22 04:12:17143--branches[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14144Pretend as if all the refs in `refs/heads` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17145on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano57827fb2010-01-23 03:02:50146branches to ones matching given shell glob. If pattern lacks '?',
Junio C Hamano81d540a2012-03-02 19:52:47147'{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56148
Junio C Hamanod2179ef2010-10-22 04:12:17149--tags[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14150Pretend as if all the refs in `refs/tags` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17151on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano81d540a2012-03-02 19:52:47152tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
153or '[', '/{asterisk}' at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56154
Junio C Hamanod2179ef2010-10-22 04:12:17155--remotes[=<pattern>]::
Junio C Hamano4fdccb22010-02-19 09:58:14156Pretend as if all the refs in `refs/remotes` are listed
Junio C Hamanod2179ef2010-10-22 04:12:17157on the command line as '<commit>'. If '<pattern>' is given, limit
Junio C Hamano97bcb482010-11-25 03:16:07158remote-tracking branches to ones matching given shell glob.
Junio C Hamano81d540a2012-03-02 19:52:47159If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50160
Junio C Hamanod2179ef2010-10-22 04:12:17161--glob=<glob-pattern>::
162Pretend as if all the refs matching shell glob '<glob-pattern>'
Junio C Hamano57827fb2010-01-23 03:02:50163are listed on the command line as '<commit>'. Leading 'refs/',
Junio C Hamano81d540a2012-03-02 19:52:47164is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
165or '[', '/{asterisk}' at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50166
Junio C Hamanof079f702013-12-06 23:43:18167--exclude=<glob-pattern>::
168
169Do not include refs matching '<glob-pattern>' that the next `--all`,
170`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
171consider. Repetitions of this option accumulate exclusion patterns
172up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
173`--glob` option (other options or arguments do not clear
Junio C Hamanofb5ffde2014-11-04 22:38:56174accumulated patterns).
Junio C Hamanof079f702013-12-06 23:43:18175+
176The patterns given should not begin with `refs/heads`, `refs/tags`, or
177`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
178respectively, and they must begin with `refs/` when applied to `--glob`
179or `--all`. If a trailing '/{asterisk}' is intended, it must be given
180explicitly.
181
Junio C Hamano2a4bcbc2014-10-29 20:07:39182--reflog::
183Pretend as if all objects mentioned by reflogs are listed on the
184command line as `<commit>`.
185
Junio C Hamano084228c2011-05-30 08:13:52186--ignore-missing::
Junio C Hamano084228c2011-05-30 08:13:52187Upon seeing an invalid object name in the input, pretend as if
188the bad input was not given.
Junio C Hamano50819852008-11-19 02:07:56189
Junio C Hamano5706e0b2009-11-24 10:54:16190ifndef::git-rev-list[]
191--bisect::
Junio C Hamano4fdccb22010-02-19 09:58:14192Pretend as if the bad bisection ref `refs/bisect/bad`
Junio C Hamano5706e0b2009-11-24 10:54:16193was listed and as if it was followed by `--not` and the good
Junio C Hamano4fdccb22010-02-19 09:58:14194bisection refs `refs/bisect/good-*` on the command
Junio C Hamanoef57d1e2015-03-25 21:23:00195line. Cannot be combined with --first-parent.
Junio C Hamano5706e0b2009-11-24 10:54:16196endif::git-rev-list[]
197
Junio C Hamanob0e02952008-01-19 08:02:00198--stdin::
Junio C Hamanob0e02952008-01-19 08:02:00199In addition to the '<commit>' listed on the command
Junio C Hamano92d80372016-07-13 22:00:05200line, read them from the standard input. If a `--` separator is
Junio C Hamano5706e0b2009-11-24 10:54:16201seen, stop reading commits and start reading paths to limit the
202result.
Junio C Hamanob0e02952008-01-19 08:02:00203
Junio C Hamano5706e0b2009-11-24 10:54:16204ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00205--quiet::
Junio C Hamanob0e02952008-01-19 08:02:00206Don't print anything to standard output. This form
207is primarily meant to allow the caller to
208test the exit status to see if a range of objects is fully
209connected (or not). It is faster than redirecting stdout
Junio C Hamanob73af6c2013-12-03 22:07:11210to `/dev/null` as the output does not have to be formatted.
Junio C Hamano69cd7c52008-06-04 07:52:59211endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00212
Junio C Hamano9a2fb2d2011-03-23 05:40:15213--cherry-mark::
Junio C Hamano9a2fb2d2011-03-23 05:40:15214Like `--cherry-pick` (see below) but mark equivalent commits
215with `=` rather than omitting them, and inequivalent ones with `+`.
216
Junio C Hamanob0e02952008-01-19 08:02:00217--cherry-pick::
Junio C Hamanob0e02952008-01-19 08:02:00218Omit any commit that introduces the same change as
Junio C Hamanob73af6c2013-12-03 22:07:11219another commit on the ``other side'' when the set of
Junio C Hamanob0e02952008-01-19 08:02:00220commits are limited with symmetric difference.
221+
222For example, if you have two branches, `A` and `B`, a usual way
223to list all commits on only one side of them is with
Junio C Hamano5cd15182011-04-05 00:21:10224`--left-right` (see the example below in the description of
Junio C Hamanob73af6c2013-12-03 22:07:11225the `--left-right` option). However, it shows the commits that were
226cherry-picked from the other branch (for example, ``3rd on b'' may be
227cherry-picked from branch A). With this option, such pairs of commits are
Junio C Hamanob0e02952008-01-19 08:02:00228excluded from the output.
229
Junio C Hamano9a2fb2d2011-03-23 05:40:15230--left-only::
231--right-only::
Junio C Hamanocd451662016-09-13 00:54:09232List only commits on the respective side of a symmetric difference,
Junio C Hamano9a2fb2d2011-03-23 05:40:15233i.e. only those which would be marked `<` resp. `>` by
234`--left-right`.
235+
236For example, `--cherry-pick --right-only A...B` omits those
237commits from `B` which are in `A` or are patch-equivalent to a commit in
Junio C Hamanob76a6862012-05-02 22:02:46238`A`. In other words, this lists the `+` commits from `git cherry A B`.
Junio C Hamano9a2fb2d2011-03-23 05:40:15239More precisely, `--cherry-pick --right-only --no-merges` gives the exact
240list.
241
242--cherry::
Junio C Hamano9a2fb2d2011-03-23 05:40:15243A synonym for `--right-only --cherry-mark --no-merges`; useful to
244limit the output to the commits on our side and mark those that
245have been applied to the other side of a forked history with
246`git log --cherry upstream...mybranch`, similar to
247`git cherry upstream mybranch`.
248
Junio C Hamanoeb415992008-06-08 22:49:47249-g::
250--walk-reflogs::
Junio C Hamanob0e02952008-01-19 08:02:00251Instead of walking the commit ancestry chain, walk
252reflog entries from the most recent one to older ones.
253When this option is used you cannot specify commits to
254exclude (that is, '{caret}commit', 'commit1..commit2',
Junio C Hamanod75148a2014-04-08 19:48:38255and 'commit1\...commit2' notations cannot be used).
Junio C Hamanob0e02952008-01-19 08:02:00256+
Junio C Hamanob73af6c2013-12-03 22:07:11257With `--pretty` format other than `oneline` (for obvious reasons),
Junio C Hamanob0e02952008-01-19 08:02:00258this causes the output to have two extra lines of information
Junio C Hamanoe548d1b2016-08-08 22:26:49259taken from the reflog. The reflog designator in the output may be shown
260as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
261reflog) or as `ref@{timestamp}` (with the timestamp for that entry),
262depending on a few rules:
263+
264--
2651. If the starting point is specified as `ref@{Nth}`, show the index
266format.
267+
2682. If the starting point was specified as `ref@{now}`, show the
269timestamp format.
270+
2713. If neither was used, but `--date` was given on the command line, show
272the timestamp in the format requested by `--date`.
273+
2744. Otherwise, show the index format.
275--
276+
277Under `--pretty=oneline`, the commit message is
Junio C Hamanob0e02952008-01-19 08:02:00278prefixed with this information on the same line.
Junio C Hamanob73af6c2013-12-03 22:07:11279This option cannot be combined with `--reverse`.
Junio C Hamanob0e02952008-01-19 08:02:00280See also linkgit:git-reflog[1].
281
282--merge::
Junio C Hamanob0e02952008-01-19 08:02:00283After a failed merge, show refs that touch files having a
284conflict and don't exist on all heads to merge.
285
286--boundary::
Junio C Hamano27159f82013-06-14 17:19:22287Output excluded boundary commits. Boundary commits are
288prefixed with `-`.
Junio C Hamanob0e02952008-01-19 08:02:00289
Junio C Hamano5b3533d2014-02-27 23:07:15290ifdef::git-rev-list[]
291--use-bitmap-index::
292
293Try to speed up the traversal using the pack bitmap index (if
294one is available). Note that when traversing with `--objects`,
295trees and blobs will not have their associated path printed.
Junio C Hamanoe48a1132016-08-03 22:40:21296
297--progress=<header>::
298Show progress reports on stderr as objects are considered. The
299`<header>` text will be printed with each progress update.
Junio C Hamano5b3533d2014-02-27 23:07:15300endif::git-rev-list[]
301
Junio C Hamanoa76cb0d2008-08-13 20:04:10302--
303
304History Simplification
305~~~~~~~~~~~~~~~~~~~~~~
306
Junio C Hamano28363492008-11-14 08:26:31307Sometimes you are only interested in parts of the history, for example the
308commits modifying a particular <path>. But there are two parts of
309'History Simplification', one part is selecting the commits and the other
310is how to do it, as there are various strategies to simplify the history.
311
312The following options select the commits to be shown:
313
314<paths>::
Junio C Hamano28363492008-11-14 08:26:31315Commits modifying the given <paths> are selected.
316
317--simplify-by-decoration::
Junio C Hamano28363492008-11-14 08:26:31318Commits that are referred by some branch or tag are selected.
319
320Note that extra commits can be shown to give a meaningful history.
321
322The following options affect the way the simplification is performed:
323
324Default mode::
Junio C Hamano28363492008-11-14 08:26:31325Simplifies the history to the simplest history explaining the
326final state of the tree. Simplest because it prunes some side
327branches if the end result is the same (i.e. merging branches
328with the same content)
329
330--full-history::
Junio C Hamano15567bc2011-07-23 00:51:59331Same as the default mode, but does not prune some history.
Junio C Hamano28363492008-11-14 08:26:31332
333--dense::
Junio C Hamano28363492008-11-14 08:26:31334Only the selected commits are shown, plus some to have a
335meaningful history.
336
337--sparse::
Junio C Hamano28363492008-11-14 08:26:31338All commits in the simplified history are shown.
339
340--simplify-merges::
Junio C Hamanob73af6c2013-12-03 22:07:11341Additional option to `--full-history` to remove some needless
Junio C Hamano28363492008-11-14 08:26:31342merges from the resulting history, as there are no selected
343commits contributing to this merge.
344
Junio C Hamano89a57342010-06-22 23:22:55345--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55346When given a range of commits to display (e.g. 'commit1..commit2'
347or 'commit2 {caret}commit1'), only display commits that exist
348directly on the ancestry chain between the 'commit1' and
349'commit2', i.e. commits that are both descendants of 'commit1',
350and ancestors of 'commit2'.
351
Junio C Hamano28363492008-11-14 08:26:31352A more detailed explanation follows.
Junio C Hamanoa76cb0d2008-08-13 20:04:10353
354Suppose you specified `foo` as the <paths>. We shall call commits
355that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
356filtered for `foo`, they look different and equal, respectively.)
357
358In the following, we will always refer to the same example history to
359illustrate the differences between simplification settings. We assume
360that you are filtering for a file `foo` in this commit graph:
361-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22362 .-A---M---N---O---P---Q
363 / / / / / /
364I B C D E Y
365 \ / / / / /
366 `-------------' X
Junio C Hamanoa76cb0d2008-08-13 20:04:10367-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22368The horizontal line of history A---Q is taken to be the first parent of
Junio C Hamanoa76cb0d2008-08-13 20:04:10369each merge. The commits are:
370
371* `I` is the initial commit, in which `foo` exists with contents
Junio C Hamanob73af6c2013-12-03 22:07:11372 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
Junio C Hamanoa76cb0d2008-08-13 20:04:10373 commits are compared to an empty tree, so `I` is !TREESAME.
374
Junio C Hamanob73af6c2013-12-03 22:07:11375* In `A`, `foo` contains just ``foo''.
Junio C Hamanoa76cb0d2008-08-13 20:04:10376
377* `B` contains the same change as `A`. Its merge `M` is trivial and
378 hence TREESAME to all parents.
379
Junio C Hamanob73af6c2013-12-03 22:07:11380* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
Junio C Hamanoa76cb0d2008-08-13 20:04:10381 so it is not TREESAME to any parent.
382
Junio C Hamanob73af6c2013-12-03 22:07:11383* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
384 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
Junio C Hamanoa76cb0d2008-08-13 20:04:10385
Junio C Hamanob73af6c2013-12-03 22:07:11386* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
387 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
Junio C Hamano27159f82013-06-14 17:19:22388
Junio C Hamanod7fccbf2013-07-25 03:24:57389* `X` is an independent root commit that added a new file `side`, and `Y`
Junio C Hamano27159f82013-06-14 17:19:22390 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
391 `Q` is TREESAME to `P`, but not to `Y`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10392
Junio C Hamanob73af6c2013-12-03 22:07:11393`rev-list` walks backwards through history, including or excluding
394commits based on whether `--full-history` and/or parent rewriting
395(via `--parents` or `--children`) are used. The following settings
Junio C Hamanoa76cb0d2008-08-13 20:04:10396are available.
397
398Default mode::
Junio C Hamanoa76cb0d2008-08-13 20:04:10399Commits are included if they are not TREESAME to any parent
Junio C Hamanob73af6c2013-12-03 22:07:11400(though this can be changed, see `--sparse` below). If the
Junio C Hamanoa76cb0d2008-08-13 20:04:10401commit was a merge, and it was TREESAME to one parent, follow
402only that parent. (Even if there are several TREESAME
403parents, follow only one of them.) Otherwise, follow all
404parents.
405+
406This results in:
407+
408-----------------------------------------------------------------------
409 .-A---N---O
Junio C Hamano89a57342010-06-22 23:22:55410 / / /
Junio C Hamanoa76cb0d2008-08-13 20:04:10411I---------D
412-----------------------------------------------------------------------
413+
414Note how the rule to only follow the TREESAME parent, if one is
415available, removed `B` from consideration entirely. `C` was
416considered via `N`, but is TREESAME. Root commits are compared to an
417empty tree, so `I` is !TREESAME.
418+
Junio C Hamanob73af6c2013-12-03 22:07:11419Parent/child relations are only visible with `--parents`, but that does
Junio C Hamanoa76cb0d2008-08-13 20:04:10420not affect the commits selected in default mode, so we have shown the
421parent lines.
422
423--full-history without parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10424This mode differs from the default in one point: always follow
425all parents of a merge, even if it is TREESAME to one of them.
426Even if more than one side of the merge has commits that are
427included, this does not imply that the merge itself is! In
428the example, we get
429+
430-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22431I A B N D O P Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10432-----------------------------------------------------------------------
433+
Junio C Hamano27159f82013-06-14 17:19:22434`M` was excluded because it is TREESAME to both parents. `E`,
Junio C Hamanoa76cb0d2008-08-13 20:04:10435`C` and `B` were all walked, but only `B` was !TREESAME, so the others
436do not appear.
437+
438Note that without parent rewriting, it is not really possible to talk
439about the parent/child relationships between the commits, so we show
440them disconnected.
441
442--full-history with parent rewriting::
Junio C Hamanoa76cb0d2008-08-13 20:04:10443Ordinary commits are only included if they are !TREESAME
Junio C Hamanob73af6c2013-12-03 22:07:11444(though this can be changed, see `--sparse` below).
Junio C Hamanoa76cb0d2008-08-13 20:04:10445+
446Merges are always included. However, their parent list is rewritten:
447Along each parent, prune away commits that are not included
448themselves. This results in
449+
450-----------------------------------------------------------------------
Junio C Hamano27159f82013-06-14 17:19:22451 .-A---M---N---O---P---Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10452 / / / / /
453I B / D /
454 \ / / / /
455 `-------------'
456-----------------------------------------------------------------------
457+
Junio C Hamanob73af6c2013-12-03 22:07:11458Compare to `--full-history` without rewriting above. Note that `E`
Junio C Hamanoa76cb0d2008-08-13 20:04:10459was pruned away because it is TREESAME, but the parent list of P was
460rewritten to contain `E`'s parent `I`. The same happened for `C` and
Junio C Hamano27159f82013-06-14 17:19:22461`N`, and `X`, `Y` and `Q`.
Junio C Hamanoa76cb0d2008-08-13 20:04:10462
463In addition to the above settings, you can change whether TREESAME
464affects inclusion:
465
Junio C Hamanoeb415992008-06-08 22:49:47466--dense::
Junio C Hamanoa76cb0d2008-08-13 20:04:10467Commits that are walked are included if they are not TREESAME
468to any parent.
469
Junio C Hamanoeb415992008-06-08 22:49:47470--sparse::
Junio C Hamanoa76cb0d2008-08-13 20:04:10471All commits that are walked are included.
472+
Junio C Hamanob73af6c2013-12-03 22:07:11473Note that without `--full-history`, this still simplifies merges: if
Junio C Hamanoa76cb0d2008-08-13 20:04:10474one of the parents is TREESAME, we follow only that one, so the other
475sides of the merge are never walked.
Junio C Hamanob0e02952008-01-19 08:02:00476
Junio C Hamanoa2f46622008-09-03 05:20:31477--simplify-merges::
Junio C Hamanoa2f46622008-09-03 05:20:31478First, build a history graph in the same way that
Junio C Hamanob73af6c2013-12-03 22:07:11479`--full-history` with parent rewriting does (see above).
Junio C Hamanoa2f46622008-09-03 05:20:31480+
481Then simplify each commit `C` to its replacement `C'` in the final
482history according to the following rules:
483+
484--
485* Set `C'` to `C`.
486+
487* Replace each parent `P` of `C'` with its simplification `P'`. In
Junio C Hamano27159f82013-06-14 17:19:22488 the process, drop parents that are ancestors of other parents or that are
489 root commits TREESAME to an empty tree, and remove duplicates, but take care
490 to never drop all parents that we are TREESAME to.
Junio C Hamanoa2f46622008-09-03 05:20:31491+
492* If after this parent rewriting, `C'` is a root or merge commit (has
493 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
494 Otherwise, it is replaced with its only parent.
495--
496+
497The effect of this is best shown by way of comparing to
Junio C Hamanob73af6c2013-12-03 22:07:11498`--full-history` with parent rewriting. The example turns into:
Junio C Hamanoa2f46622008-09-03 05:20:31499+
500-----------------------------------------------------------------------
501 .-A---M---N---O
502 / / /
503I B D
504 \ / /
505 `---------'
506-----------------------------------------------------------------------
507+
Junio C Hamanob73af6c2013-12-03 22:07:11508Note the major differences in `N`, `P`, and `Q` over `--full-history`:
Junio C Hamanoa2f46622008-09-03 05:20:31509+
510--
511* `N`'s parent list had `I` removed, because it is an ancestor of the
512 other parent `M`. Still, `N` remained because it is !TREESAME.
513+
514* `P`'s parent list similarly had `I` removed. `P` was then
515 removed completely, because it had one parent and is TREESAME.
Junio C Hamano27159f82013-06-14 17:19:22516+
517* `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
518 was a TREESAME root. `Q` was then removed completely, because it had one
519 parent and is TREESAME.
Junio C Hamanoa2f46622008-09-03 05:20:31520--
Junio C Hamanob0e02952008-01-19 08:02:00521
Junio C Hamano89a57342010-06-22 23:22:55522Finally, there is a fifth simplification mode available:
523
524--ancestry-path::
Junio C Hamano89a57342010-06-22 23:22:55525Limit the displayed commits to those directly on the ancestry
Junio C Hamanob73af6c2013-12-03 22:07:11526chain between the ``from'' and ``to'' commits in the given commit
527range. I.e. only display commits that are ancestor of the ``to''
528commit and descendants of the ``from'' commit.
Junio C Hamano89a57342010-06-22 23:22:55529+
530As an example use case, consider the following commit history:
531+
532-----------------------------------------------------------------------
533 D---E-------F
534 / \ \
535 B---C---G---H---I---J
536 / \
537A-------K---------------L--M
538-----------------------------------------------------------------------
539+
540A regular 'D..M' computes the set of commits that are ancestors of `M`,
541but excludes the ones that are ancestors of `D`. This is useful to see
542what happened to the history leading to `M` since `D`, in the sense
Junio C Hamanob73af6c2013-12-03 22:07:11543that ``what does `M` have that did not exist in `D`''. The result in this
Junio C Hamano89a57342010-06-22 23:22:55544example would be all the commits, except `A` and `B` (and `D` itself,
545of course).
546+
547When we want to find out what commits in `M` are contaminated with the
548bug introduced by `D` and need fixing, however, we might want to view
549only the subset of 'D..M' that are actually descendants of `D`, i.e.
Junio C Hamanob73af6c2013-12-03 22:07:11550excluding `C` and `K`. This is exactly what the `--ancestry-path`
Junio C Hamano89a57342010-06-22 23:22:55551option does. Applied to the 'D..M' range, it results in:
552+
553-----------------------------------------------------------------------
554E-------F
555 \ \
556 G---H---I---J
557 \
558L--M
559-----------------------------------------------------------------------
560
Junio C Hamanob73af6c2013-12-03 22:07:11561The `--simplify-by-decoration` option allows you to view only the
Junio C Hamano28363492008-11-14 08:26:31562big picture of the topology of the history, by omitting commits
563that are not referenced by tags. Commits are marked as !TREESAME
564(in other words, kept after history simplification rules described
565above) if (1) they are referenced by tags, or (2) they change the
566contents of the paths given on the command line. All other
567commits are marked as TREESAME (subject to be simplified away).
568
Junio C Hamanob0e02952008-01-19 08:02:00569ifdef::git-rev-list[]
Junio C Hamanoa76cb0d2008-08-13 20:04:10570Bisection Helpers
571~~~~~~~~~~~~~~~~~
572
Junio C Hamanob0e02952008-01-19 08:02:00573--bisect::
Junio C Hamanob73af6c2013-12-03 22:07:11574Limit output to the one commit object which is roughly halfway between
575included and excluded commits. Note that the bad bisection ref
576`refs/bisect/bad` is added to the included commits (if it
577exists) and the good bisection refs `refs/bisect/good-*` are
578added to the excluded commits (if they exist). Thus, supposing there
579are no refs in `refs/bisect/`, if
580+
Junio C Hamanob0e02952008-01-19 08:02:00581-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57582$ git rev-list --bisect foo ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00583-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11584+
Junio C Hamanob0e02952008-01-19 08:02:00585outputs 'midpoint', the output of the two commands
Junio C Hamanob73af6c2013-12-03 22:07:11586+
Junio C Hamanob0e02952008-01-19 08:02:00587-----------------------------------------------------------------------
Junio C Hamano175a1bd2008-11-10 00:08:57588$ git rev-list foo ^midpoint
589$ git rev-list midpoint ^bar ^baz
Junio C Hamanob0e02952008-01-19 08:02:00590-----------------------------------------------------------------------
Junio C Hamanob73af6c2013-12-03 22:07:11591+
Junio C Hamanob0e02952008-01-19 08:02:00592would be of roughly the same length. Finding the change which
593introduces a regression is thus reduced to a binary search: repeatedly
594generate and test new 'midpoint's until the commit chain is of length
Junio C Hamanoef57d1e2015-03-25 21:23:00595one. Cannot be combined with --first-parent.
Junio C Hamanob0e02952008-01-19 08:02:00596
597--bisect-vars::
Junio C Hamanob73af6c2013-12-03 22:07:11598This calculates the same as `--bisect`, except that refs in
599`refs/bisect/` are not used, and except that this outputs
600text ready to be eval'ed by the shell. These lines will assign the
601name of the midpoint revision to the variable `bisect_rev`, and the
602expected number of commits to be tested after `bisect_rev` is tested
603to `bisect_nr`, the expected number of commits to be tested if
604`bisect_rev` turns out to be good to `bisect_good`, the expected
605number of commits to be tested if `bisect_rev` turns out to be bad to
606`bisect_bad`, and the number of commits we are bisecting right now to
607`bisect_all`.
Junio C Hamanob0e02952008-01-19 08:02:00608
609--bisect-all::
Junio C Hamanob73af6c2013-12-03 22:07:11610This outputs all the commit objects between the included and excluded
611commits, ordered by their distance to the included and excluded
612commits. Refs in `refs/bisect/` are not used. The farthest
613from them is displayed first. (This is the only one displayed by
614`--bisect`.)
Junio C Hamano792c5a92009-03-08 08:45:13615+
Junio C Hamanob0e02952008-01-19 08:02:00616This is useful because it makes it easy to choose a good commit to
617test when you want to avoid to test some of them for some reason (they
618may not compile for example).
Junio C Hamano792c5a92009-03-08 08:45:13619+
Junio C Hamanob0e02952008-01-19 08:02:00620This option can be used along with `--bisect-vars`, in this case,
621after all the sorted commit objects, there will be the same text as if
622`--bisect-vars` had been used alone.
623endif::git-rev-list[]
624
Junio C Hamanob0e02952008-01-19 08:02:00625
626Commit Ordering
627~~~~~~~~~~~~~~~
628
629By default, the commits are shown in reverse chronological order.
630
Junio C Hamanob0e02952008-01-19 08:02:00631--date-order::
Junio C Hamanod0316112012-08-22 19:55:29632Show no parents before all of its children are shown, but
633otherwise show commits in the commit timestamp order.
Junio C Hamanob0e02952008-01-19 08:02:00634
Junio C Hamanoa1952302013-07-01 21:31:18635--author-date-order::
636Show no parents before all of its children are shown, but
637otherwise show commits in the author timestamp order.
638
Junio C Hamanod0316112012-08-22 19:55:29639--topo-order::
640Show no parents before all of its children are shown, and
641avoid showing commits on multiple lines of history
642intermixed.
643+
644For example, in a commit history like this:
645+
646----------------------------------------------------------------
647
648 ---1----2----4----7
649\ \
650 3----5----6----8---
651
652----------------------------------------------------------------
653+
654where the numbers denote the order of commit timestamps, `git
655rev-list` and friends with `--date-order` show the commits in the
656timestamp order: 8 7 6 5 4 3 2 1.
657+
658With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
6593 1); some older commits are shown before newer ones in order to
660avoid showing the commits from two parallel development track mixed
661together.
Junio C Hamanob0e02952008-01-19 08:02:00662
663--reverse::
Junio C Hamanof3ca7b82016-10-03 22:27:02664Output the commits chosen to be shown (see Commit Limiting
665section above) in reverse order. Cannot be combined with
666`--walk-reflogs`.
Junio C Hamanob0e02952008-01-19 08:02:00667
668Object Traversal
669~~~~~~~~~~~~~~~~
670
Junio C Hamano076ffcc2013-02-06 05:13:21671These options are mostly targeted for packing of Git repositories.
Junio C Hamanob0e02952008-01-19 08:02:00672
Junio C Hamano6bb32e62015-02-17 22:11:26673ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00674--objects::
Junio C Hamanob0e02952008-01-19 08:02:00675Print the object IDs of any object referenced by the listed
Junio C Hamanob73af6c2013-12-03 22:07:11676commits. `--objects foo ^bar` thus means ``send me
Junio C Hamanob0e02952008-01-19 08:02:00677all object IDs which I need to download if I have the commit
Junio C Hamanob73af6c2013-12-03 22:07:11678object _bar_ but not _foo_''.
Junio C Hamanob0e02952008-01-19 08:02:00679
680--objects-edge::
Junio C Hamanob73af6c2013-12-03 22:07:11681Similar to `--objects`, but also print the IDs of excluded
682commits prefixed with a ``-'' character. This is used by
Junio C Hamano629edff2015-01-12 23:46:02683linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
Junio C Hamanob0e02952008-01-19 08:02:00684objects in deltified form based on objects contained in these
685excluded commits to reduce network traffic.
686
Junio C Hamano629edff2015-01-12 23:46:02687--objects-edge-aggressive::
688Similar to `--objects-edge`, but it tries harder to find excluded
689commits at the cost of increased time. This is used instead of
690`--objects-edge` to build ``thin'' packs for shallow repositories.
691
Junio C Hamano6bb32e62015-02-17 22:11:26692--indexed-objects::
693Pretend as if all trees and blobs used by the index are listed
694on the command line. Note that you probably want to use
695`--objects`, too.
696
Junio C Hamanob0e02952008-01-19 08:02:00697--unpacked::
Junio C Hamanob73af6c2013-12-03 22:07:11698Only useful with `--objects`; print the object IDs that are not
Junio C Hamanob0e02952008-01-19 08:02:00699in packs.
Junio C Hamano6bb32e62015-02-17 22:11:26700endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00701
Junio C Hamanoeccdd4a2012-09-10 23:28:17702--no-walk[=(sorted|unsorted)]::
Junio C Hamanoeccdd4a2012-09-10 23:28:17703Only show the given commits, but do not traverse their ancestors.
704This has no effect if a range is specified. If the argument
Junio C Hamanob73af6c2013-12-03 22:07:11705`unsorted` is given, the commits are shown in the order they were
706given on the command line. Otherwise (if `sorted` or no argument
707was given), the commits are shown in reverse chronological order
Junio C Hamanoeccdd4a2012-09-10 23:28:17708by commit time.
Junio C Hamanoef57d1e2015-03-25 21:23:00709Cannot be combined with `--graph`.
Junio C Hamanob0e02952008-01-19 08:02:00710
711--do-walk::
Junio C Hamanob73af6c2013-12-03 22:07:11712Overrides a previous `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:22713
714Commit Formatting
715~~~~~~~~~~~~~~~~~
716
717ifdef::git-rev-list[]
718Using these options, linkgit:git-rev-list[1] will act similar to the
719more specialized family of commit log tools: linkgit:git-log[1],
720linkgit:git-show[1], and linkgit:git-whatchanged[1]
721endif::git-rev-list[]
722
723include::pretty-options.txt[]
724
725--relative-date::
Junio C Hamanod2c978f2011-03-20 19:42:22726Synonym for `--date=relative`.
727
Junio C Hamano1eb56092015-10-05 20:39:53728--date=<format>::
Junio C Hamanod2c978f2011-03-20 19:42:22729Only takes effect for dates shown in human-readable format, such
Junio C Hamanob73af6c2013-12-03 22:07:11730as when using `--pretty`. `log.date` config variable sets a default
Junio C Hamano1eb56092015-10-05 20:39:53731value for the log command's `--date` option. By default, dates
732are shown in the original time zone (either committer's or
733author's). If `-local` is appended to the format (e.g.,
734`iso-local`), the user's local time zone is used instead.
Junio C Hamanod2c978f2011-03-20 19:42:22735+
736`--date=relative` shows dates relative to the current time,
Junio C Hamanoe548d1b2016-08-08 22:26:49737e.g. ``2 hours ago''. The `-local` option has no effect for
738`--date=relative`.
Junio C Hamanod2c978f2011-03-20 19:42:22739+
Junio C Hamano1eb56092015-10-05 20:39:53740`--date=local` is an alias for `--date=default-local`.
Junio C Hamanod2c978f2011-03-20 19:42:22741+
Junio C Hamanoac12f0e2014-09-19 22:32:51742`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
743The differences to the strict ISO 8601 format are:
744
745- a space instead of the `T` date/time delimiter
746- a space between time and time zone
747- no colon between hours and minutes of the time zone
748
749+
750`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
751ISO 8601 format.
Junio C Hamanod2c978f2011-03-20 19:42:22752+
753`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
Junio C Hamanob73af6c2013-12-03 22:07:11754format, often found in email messages.
Junio C Hamanod2c978f2011-03-20 19:42:22755+
Junio C Hamanob73af6c2013-12-03 22:07:11756`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
Junio C Hamanod2c978f2011-03-20 19:42:22757+
Junio C Hamanoe548d1b2016-08-08 22:26:49758`--date=raw` shows the date as seconds since the epoch (1970-01-01
75900:00:00 UTC), followed by a space, and then the timezone as an offset
760from UTC (a `+` or `-` with four digits; the first two are hours, and
761the second two are minutes). I.e., as if the timestamp were formatted
762with `strftime("%s %z")`).
763Note that the `-local` option does not affect the seconds-since-epoch
764value (which is always measured in UTC), but does switch the accompanying
765timezone value.
766+
767`--date=unix` shows the date as a Unix epoch timestamp (seconds since
7681970). As with `--raw`, this is always in UTC and therefore `-local`
769has no effect.
Junio C Hamanod2c978f2011-03-20 19:42:22770+
Junio C Hamanod7ed4042015-08-03 19:43:00771`--date=format:...` feeds the format `...` to your system `strftime`.
772Use `--date=format:%c` to show the date in your system locale's
773preferred format. See the `strftime` manual for a complete list of
Junio C Hamano1eb56092015-10-05 20:39:53774format placeholders. When using `-local`, the correct syntax is
775`--date=format-local:...`.
Junio C Hamanod7ed4042015-08-03 19:43:00776+
Junio C Hamano1eb56092015-10-05 20:39:53777`--date=default` is the default format, and is similar to
778`--date=rfc2822`, with a few exceptions:
779
780- there is no comma after the day-of-week
781
782- the time zone is omitted when the local time zone is used
Junio C Hamanod2c978f2011-03-20 19:42:22783
784ifdef::git-rev-list[]
785--header::
Junio C Hamanod2c978f2011-03-20 19:42:22786Print the contents of the commit in raw-format; each record is
787separated with a NUL character.
788endif::git-rev-list[]
789
790--parents::
Junio C Hamanod2c978f2011-03-20 19:42:22791Print also the parents of the commit (in the form "commit parent...").
792Also enables parent rewriting, see 'History Simplification' below.
793
794--children::
Junio C Hamanod2c978f2011-03-20 19:42:22795Print also the children of the commit (in the form "commit child...").
796Also enables parent rewriting, see 'History Simplification' below.
797
798ifdef::git-rev-list[]
799--timestamp::
800Print the raw commit timestamp.
801endif::git-rev-list[]
802
803--left-right::
Junio C Hamanocd451662016-09-13 00:54:09804Mark which side of a symmetric difference a commit is reachable from.
Junio C Hamanod2c978f2011-03-20 19:42:22805Commits from the left side are prefixed with `<` and those from
806the right with `>`. If combined with `--boundary`, those
807commits are prefixed with `-`.
808+
809For example, if you have this topology:
810+
811-----------------------------------------------------------------------
812 y---b---b branch B
813 / \ /
814 / .
815 / / \
816 o---x---a---a branch A
817-----------------------------------------------------------------------
818+
819you would get an output like this:
820+
821-----------------------------------------------------------------------
822$ git rev-list --left-right --boundary --pretty=oneline A...B
823
824>bbbbbbb... 3rd on b
825>bbbbbbb... 2nd on b
826<aaaaaaa... 3rd on a
827<aaaaaaa... 2nd on a
828-yyyyyyy... 1st on b
829-xxxxxxx... 1st on a
830-----------------------------------------------------------------------
831
832--graph::
Junio C Hamanod2c978f2011-03-20 19:42:22833Draw a text-based graphical representation of the commit history
834on the left hand side of the output. This may cause extra lines
835to be printed in between commits, in order for the graph history
836to be drawn properly.
Junio C Hamanoef57d1e2015-03-25 21:23:00837Cannot be combined with `--no-walk`.
Junio C Hamanod2c978f2011-03-20 19:42:22838+
839This enables parent rewriting, see 'History Simplification' below.
840+
Junio C Hamanob73af6c2013-12-03 22:07:11841This implies the `--topo-order` option by default, but the
842`--date-order` option may also be specified.
Junio C Hamanod2c978f2011-03-20 19:42:22843
Junio C Hamano624dd4c2014-04-03 21:56:30844--show-linear-break[=<barrier>]::
845When --graph is not used, all history branches are flattened
846which can make it hard to see that the two consecutive commits
847do not belong to a linear branch. This option puts a barrier
848in between them in that case. If `<barrier>` is specified, it
849is the string that will be shown instead of the default one.
850
Junio C Hamanod2c978f2011-03-20 19:42:22851ifdef::git-rev-list[]
852--count::
853Print a number stating how many commits would have been
854listed, and suppress all other output. When used together
Junio C Hamanob73af6c2013-12-03 22:07:11855with `--left-right`, instead print the counts for left and
Junio C Hamanob77f8192011-05-05 01:30:38856right commits, separated by a tab. When used together with
Junio C Hamanob73af6c2013-12-03 22:07:11857`--cherry-mark`, omit patch equivalent commits from these
Junio C Hamanob77f8192011-05-05 01:30:38858counts and print the count for equivalent commits separated
859by a tab.
Junio C Hamanod2c978f2011-03-20 19:42:22860endif::git-rev-list[]
861
Junio C Hamanod2c978f2011-03-20 19:42:22862ifndef::git-rev-list[]
863Diff Formatting
864~~~~~~~~~~~~~~~
865
Junio C Hamanob73af6c2013-12-03 22:07:11866Listed below are options that control the formatting of diff output.
Junio C Hamanod2c978f2011-03-20 19:42:22867Some of them are specific to linkgit:git-rev-list[1], however other diff
868options may be given. See linkgit:git-diff-files[1] for more options.
869
870-c::
Junio C Hamanod2c978f2011-03-20 19:42:22871With this option, diff output for a merge commit
872shows the differences from each of the parents to the merge result
873simultaneously instead of showing pairwise diff between a parent
874and the result one at a time. Furthermore, it lists only files
875which were modified from all parents.
876
877--cc::
Junio C Hamanob73af6c2013-12-03 22:07:11878This flag implies the `-c` option and further compresses the
Junio C Hamanod2c978f2011-03-20 19:42:22879patch output by omitting uninteresting hunks whose contents in
880the parents have only two variants and the merge result picks
881one of them without modification.
882
883-m::
Junio C Hamanod2c978f2011-03-20 19:42:22884This flag makes the merge commits show the full diff like
885regular commits; for each merge parent, a separate log entry
886and diff is generated. An exception is that only diff against
Junio C Hamanob73af6c2013-12-03 22:07:11887the first parent is shown when `--first-parent` option is given;
Junio C Hamanod2c978f2011-03-20 19:42:22888in that case, the output represents the changes the merge
889brought _into_ the then-current branch.
890
891-r::
Junio C Hamanod2c978f2011-03-20 19:42:22892Show recursive diffs.
893
894-t::
Junio C Hamanob73af6c2013-12-03 22:07:11895Show the tree objects in the diff output. This implies `-r`.
Junio C Hamanod2c978f2011-03-20 19:42:22896endif::git-rev-list[]