4 Besides specifying a range of commits that should be listed using the
5 special notations explained in the description, additional commit
6 limiting may be applied.
8 Using more options generally further limits the output (e.g.
9 `--since=<date1>` limits to commits newer than `<date1>`, and using it
10 with `--grep=<pattern>` further limits to commits whose log message
11 has a line that matches `<pattern>`), unless otherwise noted.
13 Note that these are applied before commit
14 ordering and formatting options, such as `--reverse`.
20 --max-count=<number>::
21 Limit the number of commits to output.
24 Skip 'number' commits before starting to show the commit output.
28 Show commits more recent than a specific date.
32 Show commits older than a specific date.
35 --max-age=<timestamp>::
36 --min-age=<timestamp>::
37 Limit the commits output to specified time range.
41 --committer=<pattern>::
42 Limit the commits output to ones with author/committer
43 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>`).
48 --grep-reflog=<pattern>::
49 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
52 matches any of the given patterns are chosen. It is an
53 error to use this option unless `--walk-reflogs` is in use.
56 Limit the commits output to ones with log message that
57 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
62 When `--show-notes` is in effect, the message from the notes is
63 matched as if it were part of the log message.
66 Limit the commits output to ones that match all given `--grep`,
67 instead of ones that match at least one.
70 Limit the commits output to ones with log message that do not
71 match the pattern specified with `--grep=<pattern>`.
74 --regexp-ignore-case::
75 Match the regular expression limiting patterns without regard to letter
79 Consider the limiting patterns to be basic regular expressions;
84 Consider the limiting patterns to be extended regular expressions
85 instead of the default basic regular expressions.
89 Consider the limiting patterns to be fixed strings (don't interpret
90 pattern as a regular expression).
93 Consider the limiting patterns to be Perl-compatible regular expressions.
94 Requires libpcre to be compiled in.
97 Stop when a given path disappears from the tree.
100 Print only merge commits. This is exactly the same as `--min-parents=2`.
103 Do not print commits with more than one parent. This is
104 exactly the same as `--max-parents=1`.
106 --min-parents=<number>::
107 --max-parents=<number>::
110 Show only commits which have at least (or at most) that many parent
111 commits. In particular, `--max-parents=1` is the same as `--no-merges`,
112 `--min-parents=2` is the same as `--merges`. `--max-parents=0`
113 gives all root commits and `--min-parents=3` all octopus merges.
115 `--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
116 again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
117 parents) and `--max-parents=-1` (negative numbers denote no upper limit).
120 Follow only the first parent commit upon seeing a merge
121 commit. This option can give a better overview when
122 viewing the evolution of a particular topic branch,
123 because merges into a topic branch tend to be only about
124 adjusting to updated upstream from time to time, and
125 this option allows you to ignore the individual commits
126 brought in to your history by such a merge. Cannot be
127 combined with --bisect.
130 Reverses the meaning of the '{caret}' prefix (or lack thereof)
131 for all following revision specifiers, up to the next `--not`.
134 Pretend as if all the refs in `refs/` are listed on the
135 command line as '<commit>'.
137 --branches[=<pattern>]::
138 Pretend as if all the refs in `refs/heads` are listed
139 on the command line as '<commit>'. If '<pattern>' is given, limit
140 branches to ones matching given shell glob. If pattern lacks '?',
141 '{asterisk}', or '[', '/{asterisk}' at the end is implied.
144 Pretend as if all the refs in `refs/tags` are listed
145 on the command line as '<commit>'. If '<pattern>' is given, limit
146 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
147 or '[', '/{asterisk}' at the end is implied.
149 --remotes[=<pattern>]::
150 Pretend as if all the refs in `refs/remotes` are listed
151 on the command line as '<commit>'. If '<pattern>' is given, limit
152 remote-tracking branches to ones matching given shell glob.
153 If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
155 --glob=<glob-pattern>::
156 Pretend as if all the refs matching shell glob '<glob-pattern>'
157 are listed on the command line as '<commit>'. Leading 'refs/',
158 is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
159 or '[', '/{asterisk}' at the end is implied.
161 --exclude=<glob-pattern>::
163 Do not include refs matching '<glob-pattern>' that the next `--all`,
164 `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
165 consider. Repetitions of this option accumulate exclusion patterns
166 up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
167 `--glob` option (other options or arguments do not clear
168 accumulated patterns).
170 The patterns given should not begin with `refs/heads`, `refs/tags`, or
171 `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
172 respectively, and they must begin with `refs/` when applied to `--glob`
173 or `--all`. If a trailing '/{asterisk}' is intended, it must be given
177 Pretend as if all objects mentioned by reflogs are listed on the
178 command line as `<commit>`.
181 Upon seeing an invalid object name in the input, pretend as if
182 the bad input was not given.
184 ifndef::git-rev-list[]
186 Pretend as if the bad bisection ref `refs/bisect/bad`
187 was listed and as if it was followed by `--not` and the good
188 bisection refs `refs/bisect/good-*` on the command
189 line. Cannot be combined with --first-parent.
190 endif::git-rev-list[]
193 In addition to the '<commit>' listed on the command
194 line, read them from the standard input. If a '--' separator is
195 seen, stop reading commits and start reading paths to limit the
198 ifdef::git-rev-list[]
200 Don't print anything to standard output. This form
201 is primarily meant to allow the caller to
202 test the exit status to see if a range of objects is fully
203 connected (or not). It is faster than redirecting stdout
204 to `/dev/null` as the output does not have to be formatted.
205 endif::git-rev-list[]
208 Like `--cherry-pick` (see below) but mark equivalent commits
209 with `=` rather than omitting them, and inequivalent ones with `+`.
212 Omit any commit that introduces the same change as
213 another commit on the ``other side'' when the set of
214 commits are limited with symmetric difference.
216 For example, if you have two branches, `A` and `B`, a usual way
217 to list all commits on only one side of them is with
218 `--left-right` (see the example below in the description of
219 the `--left-right` option). However, it shows the commits that were
220 cherry-picked from the other branch (for example, ``3rd on b'' may be
221 cherry-picked from branch A). With this option, such pairs of commits are
222 excluded from the output.
226 List only commits on the respective side of a symmetric range,
227 i.e. only those which would be marked `<` resp. `>` by
230 For example, `--cherry-pick --right-only A...B` omits those
231 commits from `B` which are in `A` or are patch-equivalent to a commit in
232 `A`. In other words, this lists the `+` commits from `git cherry A B`.
233 More precisely, `--cherry-pick --right-only --no-merges` gives the exact
237 A synonym for `--right-only --cherry-mark --no-merges`; useful to
238 limit the output to the commits on our side and mark those that
239 have been applied to the other side of a forked history with
240 `git log --cherry upstream...mybranch`, similar to
241 `git cherry upstream mybranch`.
245 Instead of walking the commit ancestry chain, walk
246 reflog entries from the most recent one to older ones.
247 When this option is used you cannot specify commits to
248 exclude (that is, '{caret}commit', 'commit1..commit2',
249 and 'commit1\...commit2' notations cannot be used).
251 With `--pretty` format other than `oneline` (for obvious reasons),
252 this causes the output to have two extra lines of information
253 taken from the reflog. By default, 'commit@\{Nth}' notation is
254 used in the output. When the starting commit is specified as
255 'commit@\{now}', output also uses 'commit@\{timestamp}' notation
256 instead. Under `--pretty=oneline`, the commit message is
257 prefixed with this information on the same line.
258 This option cannot be combined with `--reverse`.
259 See also linkgit:git-reflog[1].
262 After a failed merge, show refs that touch files having a
263 conflict and don't exist on all heads to merge.
266 Output excluded boundary commits. Boundary commits are
269 ifdef::git-rev-list[]
272 Try to speed up the traversal using the pack bitmap index (if
273 one is available). Note that when traversing with `--objects`,
274 trees and blobs will not have their associated path printed.
275 endif::git-rev-list[]
279 History Simplification
280 ~~~~~~~~~~~~~~~~~~~~~~
282 Sometimes you are only interested in parts of the history, for example the
283 commits modifying a particular <path>. But there are two parts of
284 'History Simplification', one part is selecting the commits and the other
285 is how to do it, as there are various strategies to simplify the history.
287 The following options select the commits to be shown:
290 Commits modifying the given <paths> are selected.
292 --simplify-by-decoration::
293 Commits that are referred by some branch or tag are selected.
295 Note that extra commits can be shown to give a meaningful history.
297 The following options affect the way the simplification is performed:
300 Simplifies the history to the simplest history explaining the
301 final state of the tree. Simplest because it prunes some side
302 branches if the end result is the same (i.e. merging branches
303 with the same content)
306 Same as the default mode, but does not prune some history.
309 Only the selected commits are shown, plus some to have a
313 All commits in the simplified history are shown.
316 Additional option to `--full-history` to remove some needless
317 merges from the resulting history, as there are no selected
318 commits contributing to this merge.
321 When given a range of commits to display (e.g. 'commit1..commit2'
322 or 'commit2 {caret}commit1'), only display commits that exist
323 directly on the ancestry chain between the 'commit1' and
324 'commit2', i.e. commits that are both descendants of 'commit1',
325 and ancestors of 'commit2'.
327 A more detailed explanation follows.
329 Suppose you specified `foo` as the <paths>. We shall call commits
330 that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
331 filtered for `foo`, they look different and equal, respectively.)
333 In the following, we will always refer to the same example history to
334 illustrate the differences between simplification settings. We assume
335 that you are filtering for a file `foo` in this commit graph:
336 -----------------------------------------------------------------------
337 .-A---M---N---O---P---Q
342 -----------------------------------------------------------------------
343 The horizontal line of history A---Q is taken to be the first parent of
344 each merge. The commits are:
346 * `I` is the initial commit, in which `foo` exists with contents
347 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
348 commits are compared to an empty tree, so `I` is !TREESAME.
350 * In `A`, `foo` contains just ``foo''.
352 * `B` contains the same change as `A`. Its merge `M` is trivial and
353 hence TREESAME to all parents.
355 * `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
356 so it is not TREESAME to any parent.
358 * `D` sets `foo` to ``baz''. Its merge `O` combines the strings from
359 `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.
361 * `E` changes `quux` to ``xyzzy'', and its merge `P` combines the
362 strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.
364 * `X` is an independent root commit that added a new file `side`, and `Y`
365 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
366 `Q` is TREESAME to `P`, but not to `Y`.
368 `rev-list` walks backwards through history, including or excluding
369 commits based on whether `--full-history` and/or parent rewriting
370 (via `--parents` or `--children`) are used. The following settings
374 Commits are included if they are not TREESAME to any parent
375 (though this can be changed, see `--sparse` below). If the
376 commit was a merge, and it was TREESAME to one parent, follow
377 only that parent. (Even if there are several TREESAME
378 parents, follow only one of them.) Otherwise, follow all
383 -----------------------------------------------------------------------
387 -----------------------------------------------------------------------
389 Note how the rule to only follow the TREESAME parent, if one is
390 available, removed `B` from consideration entirely. `C` was
391 considered via `N`, but is TREESAME. Root commits are compared to an
392 empty tree, so `I` is !TREESAME.
394 Parent/child relations are only visible with `--parents`, but that does
395 not affect the commits selected in default mode, so we have shown the
398 --full-history without parent rewriting::
399 This mode differs from the default in one point: always follow
400 all parents of a merge, even if it is TREESAME to one of them.
401 Even if more than one side of the merge has commits that are
402 included, this does not imply that the merge itself is! In
405 -----------------------------------------------------------------------
407 -----------------------------------------------------------------------
409 `M` was excluded because it is TREESAME to both parents. `E`,
410 `C` and `B` were all walked, but only `B` was !TREESAME, so the others
413 Note that without parent rewriting, it is not really possible to talk
414 about the parent/child relationships between the commits, so we show
417 --full-history with parent rewriting::
418 Ordinary commits are only included if they are !TREESAME
419 (though this can be changed, see `--sparse` below).
421 Merges are always included. However, their parent list is rewritten:
422 Along each parent, prune away commits that are not included
423 themselves. This results in
425 -----------------------------------------------------------------------
426 .-A---M---N---O---P---Q
431 -----------------------------------------------------------------------
433 Compare to `--full-history` without rewriting above. Note that `E`
434 was pruned away because it is TREESAME, but the parent list of P was
435 rewritten to contain `E`'s parent `I`. The same happened for `C` and
436 `N`, and `X`, `Y` and `Q`.
438 In addition to the above settings, you can change whether TREESAME
442 Commits that are walked are included if they are not TREESAME
446 All commits that are walked are included.
448 Note that without `--full-history`, this still simplifies merges: if
449 one of the parents is TREESAME, we follow only that one, so the other
450 sides of the merge are never walked.
453 First, build a history graph in the same way that
454 `--full-history` with parent rewriting does (see above).
456 Then simplify each commit `C` to its replacement `C'` in the final
457 history according to the following rules:
462 * Replace each parent `P` of `C'` with its simplification `P'`. In
463 the process, drop parents that are ancestors of other parents or that are
464 root commits TREESAME to an empty tree, and remove duplicates, but take care
465 to never drop all parents that we are TREESAME to.
467 * If after this parent rewriting, `C'` is a root or merge commit (has
468 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
469 Otherwise, it is replaced with its only parent.
472 The effect of this is best shown by way of comparing to
473 `--full-history` with parent rewriting. The example turns into:
475 -----------------------------------------------------------------------
481 -----------------------------------------------------------------------
483 Note the major differences in `N`, `P`, and `Q` over `--full-history`:
486 * `N`'s parent list had `I` removed, because it is an ancestor of the
487 other parent `M`. Still, `N` remained because it is !TREESAME.
489 * `P`'s parent list similarly had `I` removed. `P` was then
490 removed completely, because it had one parent and is TREESAME.
492 * `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it
493 was a TREESAME root. `Q` was then removed completely, because it had one
494 parent and is TREESAME.
497 Finally, there is a fifth simplification mode available:
500 Limit the displayed commits to those directly on the ancestry
501 chain between the ``from'' and ``to'' commits in the given commit
502 range. I.e. only display commits that are ancestor of the ``to''
503 commit and descendants of the ``from'' commit.
505 As an example use case, consider the following commit history:
507 -----------------------------------------------------------------------
510 B---C---G---H---I---J
512 A-------K---------------L--M
513 -----------------------------------------------------------------------
515 A regular 'D..M' computes the set of commits that are ancestors of `M`,
516 but excludes the ones that are ancestors of `D`. This is useful to see
517 what happened to the history leading to `M` since `D`, in the sense
518 that ``what does `M` have that did not exist in `D`''. The result in this
519 example would be all the commits, except `A` and `B` (and `D` itself,
522 When we want to find out what commits in `M` are contaminated with the
523 bug introduced by `D` and need fixing, however, we might want to view
524 only the subset of 'D..M' that are actually descendants of `D`, i.e.
525 excluding `C` and `K`. This is exactly what the `--ancestry-path`
526 option does. Applied to the 'D..M' range, it results in:
528 -----------------------------------------------------------------------
534 -----------------------------------------------------------------------
536 The `--simplify-by-decoration` option allows you to view only the
537 big picture of the topology of the history, by omitting commits
538 that are not referenced by tags. Commits are marked as !TREESAME
539 (in other words, kept after history simplification rules described
540 above) if (1) they are referenced by tags, or (2) they change the
541 contents of the paths given on the command line. All other
542 commits are marked as TREESAME (subject to be simplified away).
544 ifdef::git-rev-list[]
549 Limit output to the one commit object which is roughly halfway between
550 included and excluded commits. Note that the bad bisection ref
551 `refs/bisect/bad` is added to the included commits (if it
552 exists) and the good bisection refs `refs/bisect/good-*` are
553 added to the excluded commits (if they exist). Thus, supposing there
554 are no refs in `refs/bisect/`, if
556 -----------------------------------------------------------------------
557 $ git rev-list --bisect foo ^bar ^baz
558 -----------------------------------------------------------------------
560 outputs 'midpoint', the output of the two commands
562 -----------------------------------------------------------------------
563 $ git rev-list foo ^midpoint
564 $ git rev-list midpoint ^bar ^baz
565 -----------------------------------------------------------------------
567 would be of roughly the same length. Finding the change which
568 introduces a regression is thus reduced to a binary search: repeatedly
569 generate and test new 'midpoint's until the commit chain is of length
570 one. Cannot be combined with --first-parent.
573 This calculates the same as `--bisect`, except that refs in
574 `refs/bisect/` are not used, and except that this outputs
575 text ready to be eval'ed by the shell. These lines will assign the
576 name of the midpoint revision to the variable `bisect_rev`, and the
577 expected number of commits to be tested after `bisect_rev` is tested
578 to `bisect_nr`, the expected number of commits to be tested if
579 `bisect_rev` turns out to be good to `bisect_good`, the expected
580 number of commits to be tested if `bisect_rev` turns out to be bad to
581 `bisect_bad`, and the number of commits we are bisecting right now to
585 This outputs all the commit objects between the included and excluded
586 commits, ordered by their distance to the included and excluded
587 commits. Refs in `refs/bisect/` are not used. The farthest
588 from them is displayed first. (This is the only one displayed by
591 This is useful because it makes it easy to choose a good commit to
592 test when you want to avoid to test some of them for some reason (they
593 may not compile for example).
595 This option can be used along with `--bisect-vars`, in this case,
596 after all the sorted commit objects, there will be the same text as if
597 `--bisect-vars` had been used alone.
598 endif::git-rev-list[]
604 By default, the commits are shown in reverse chronological order.
607 Show no parents before all of its children are shown, but
608 otherwise show commits in the commit timestamp order.
610 --author-date-order::
611 Show no parents before all of its children are shown, but
612 otherwise show commits in the author timestamp order.
615 Show no parents before all of its children are shown, and
616 avoid showing commits on multiple lines of history
619 For example, in a commit history like this:
621 ----------------------------------------------------------------
627 ----------------------------------------------------------------
629 where the numbers denote the order of commit timestamps, `git
630 rev-list` and friends with `--date-order` show the commits in the
631 timestamp order: 8 7 6 5 4 3 2 1.
633 With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
634 3 1); some older commits are shown before newer ones in order to
635 avoid showing the commits from two parallel development track mixed
639 Output the commits in reverse order.
640 Cannot be combined with `--walk-reflogs`.
645 These options are mostly targeted for packing of Git repositories.
647 ifdef::git-rev-list[]
649 Print the object IDs of any object referenced by the listed
650 commits. `--objects foo ^bar` thus means ``send me
651 all object IDs which I need to download if I have the commit
652 object _bar_ but not _foo_''.
655 Similar to `--objects`, but also print the IDs of excluded
656 commits prefixed with a ``-'' character. This is used by
657 linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
658 objects in deltified form based on objects contained in these
659 excluded commits to reduce network traffic.
661 --objects-edge-aggressive::
662 Similar to `--objects-edge`, but it tries harder to find excluded
663 commits at the cost of increased time. This is used instead of
664 `--objects-edge` to build ``thin'' packs for shallow repositories.
667 Pretend as if all trees and blobs used by the index are listed
668 on the command line. Note that you probably want to use
672 Only useful with `--objects`; print the object IDs that are not
674 endif::git-rev-list[]
676 --no-walk[=(sorted|unsorted)]::
677 Only show the given commits, but do not traverse their ancestors.
678 This has no effect if a range is specified. If the argument
679 `unsorted` is given, the commits are shown in the order they were
680 given on the command line. Otherwise (if `sorted` or no argument
681 was given), the commits are shown in reverse chronological order
683 Cannot be combined with `--graph`.
686 Overrides a previous `--no-walk`.
691 ifdef::git-rev-list[]
692 Using these options, linkgit:git-rev-list[1] will act similar to the
693 more specialized family of commit log tools: linkgit:git-log[1],
694 linkgit:git-show[1], and linkgit:git-whatchanged[1]
695 endif::git-rev-list[]
697 include::pretty-options.txt[]
700 Synonym for `--date=relative`.
702 --date=(relative|local|default|iso|iso-strict|rfc|short|raw)::
703 Only takes effect for dates shown in human-readable format, such
704 as when using `--pretty`. `log.date` config variable sets a default
705 value for the log command's `--date` option.
707 `--date=relative` shows dates relative to the current time,
708 e.g. ``2 hours ago''.
710 `--date=local` shows timestamps in user's local time zone.
712 `--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
713 The differences to the strict ISO 8601 format are:
715 - a space instead of the `T` date/time delimiter
716 - a space between time and time zone
717 - no colon between hours and minutes of the time zone
720 `--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
723 `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
724 format, often found in email messages.
726 `--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
728 `--date=raw` shows the date in the internal raw Git format `%s %z` format.
730 `--date=default` shows timestamps in the original time zone
731 (either committer's or author's).
733 ifdef::git-rev-list[]
735 Print the contents of the commit in raw-format; each record is
736 separated with a NUL character.
737 endif::git-rev-list[]
740 Print also the parents of the commit (in the form "commit parent...").
741 Also enables parent rewriting, see 'History Simplification' below.
744 Print also the children of the commit (in the form "commit child...").
745 Also enables parent rewriting, see 'History Simplification' below.
747 ifdef::git-rev-list[]
749 Print the raw commit timestamp.
750 endif::git-rev-list[]
753 Mark which side of a symmetric diff a commit is reachable from.
754 Commits from the left side are prefixed with `<` and those from
755 the right with `>`. If combined with `--boundary`, those
756 commits are prefixed with `-`.
758 For example, if you have this topology:
760 -----------------------------------------------------------------------
765 o---x---a---a branch A
766 -----------------------------------------------------------------------
768 you would get an output like this:
770 -----------------------------------------------------------------------
771 $ git rev-list --left-right --boundary --pretty=oneline A...B
779 -----------------------------------------------------------------------
782 Draw a text-based graphical representation of the commit history
783 on the left hand side of the output. This may cause extra lines
784 to be printed in between commits, in order for the graph history
785 to be drawn properly.
786 Cannot be combined with `--no-walk`.
788 This enables parent rewriting, see 'History Simplification' below.
790 This implies the `--topo-order` option by default, but the
791 `--date-order` option may also be specified.
793 --show-linear-break[=<barrier>]::
794 When --graph is not used, all history branches are flattened
795 which can make it hard to see that the two consecutive commits
796 do not belong to a linear branch. This option puts a barrier
797 in between them in that case. If `<barrier>` is specified, it
798 is the string that will be shown instead of the default one.
800 ifdef::git-rev-list[]
802 Print a number stating how many commits would have been
803 listed, and suppress all other output. When used together
804 with `--left-right`, instead print the counts for left and
805 right commits, separated by a tab. When used together with
806 `--cherry-mark`, omit patch equivalent commits from these
807 counts and print the count for equivalent commits separated
809 endif::git-rev-list[]
811 ifndef::git-rev-list[]
815 Listed below are options that control the formatting of diff output.
816 Some of them are specific to linkgit:git-rev-list[1], however other diff
817 options may be given. See linkgit:git-diff-files[1] for more options.
820 With this option, diff output for a merge commit
821 shows the differences from each of the parents to the merge result
822 simultaneously instead of showing pairwise diff between a parent
823 and the result one at a time. Furthermore, it lists only files
824 which were modified from all parents.
827 This flag implies the `-c` option and further compresses the
828 patch output by omitting uninteresting hunks whose contents in
829 the parents have only two variants and the merge result picks
830 one of them without modification.
833 This flag makes the merge commits show the full diff like
834 regular commits; for each merge parent, a separate log entry
835 and diff is generated. An exception is that only diff against
836 the first parent is shown when `--first-parent` option is given;
837 in that case, the output represents the changes the merge
838 brought _into_ the then-current branch.
841 Show recursive diffs.
844 Show the tree objects in the diff output. This implies `-r`.
845 endif::git-rev-list[]