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
61 ifndef::git-rev-list[]
63 When `--show-notes` is in effect, the message from the notes is
64 matched as if it were part of the log message.
68 Limit the commits output to ones that match all given `--grep`,
69 instead of ones that match at least one.
72 Limit the commits output to ones with log message that do not
73 match the pattern specified with `--grep=<pattern>`.
76 --regexp-ignore-case::
77 Match the regular expression limiting patterns without regard to letter
81 Consider the limiting patterns to be basic regular expressions;
86 Consider the limiting patterns to be extended regular expressions
87 instead of the default basic regular expressions.
91 Consider the limiting patterns to be fixed strings (don't interpret
92 pattern as a regular expression).
95 Consider the limiting patterns to be Perl-compatible regular expressions.
96 Requires libpcre to be compiled in.
99 Stop when a given path disappears from the tree.
102 Print only merge commits. This is exactly the same as `--min-parents=2`.
105 Do not print commits with more than one parent. This is
106 exactly the same as `--max-parents=1`.
108 --min-parents=<number>::
109 --max-parents=<number>::
112 Show only commits which have at least (or at most) that many parent
113 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.
117 `--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
118 again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
119 parents) and `--max-parents=-1` (negative numbers denote no upper limit).
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
128 brought in to your history by such a merge. Cannot be
129 combined with --bisect.
132 Reverses the meaning of the '{caret}' prefix (or lack thereof)
133 for all following revision specifiers, up to the next `--not`.
136 Pretend as if all the refs in `refs/` are listed on the
137 command line as '<commit>'.
139 --branches[=<pattern>]::
140 Pretend as if all the refs in `refs/heads` are listed
141 on the command line as '<commit>'. If '<pattern>' is given, limit
142 branches to ones matching given shell glob. If pattern lacks '?',
143 '{asterisk}', or '[', '/{asterisk}' at the end is implied.
146 Pretend as if all the refs in `refs/tags` are listed
147 on the command line as '<commit>'. If '<pattern>' is given, limit
148 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',
149 or '[', '/{asterisk}' at the end is implied.
151 --remotes[=<pattern>]::
152 Pretend as if all the refs in `refs/remotes` are listed
153 on the command line as '<commit>'. If '<pattern>' is given, limit
154 remote-tracking branches to ones matching given shell glob.
155 If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied.
157 --glob=<glob-pattern>::
158 Pretend as if all the refs matching shell glob '<glob-pattern>'
159 are listed on the command line as '<commit>'. Leading 'refs/',
160 is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
161 or '[', '/{asterisk}' at the end is implied.
163 --exclude=<glob-pattern>::
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
170 accumulated patterns).
172 The patterns given should not begin with `refs/heads`, `refs/tags`, or
173 `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
174 respectively, and they must begin with `refs/` when applied to `--glob`
175 or `--all`. If a trailing '/{asterisk}' is intended, it must be given
179 Pretend as if all objects mentioned by reflogs are listed on the
180 command line as `<commit>`.
183 Upon seeing an invalid object name in the input, pretend as if
184 the bad input was not given.
186 ifndef::git-rev-list[]
188 Pretend as if the bad bisection ref `refs/bisect/bad`
189 was listed and as if it was followed by `--not` and the good
190 bisection refs `refs/bisect/good-*` on the command
191 line. Cannot be combined with --first-parent.
192 endif::git-rev-list[]
195 In addition to the '<commit>' listed on the command
196 line, read them from the standard input. If a '--' separator is
197 seen, stop reading commits and start reading paths to limit the
200 ifdef::git-rev-list[]
202 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
206 to `/dev/null` as the output does not have to be formatted.
207 endif::git-rev-list[]
210 Like `--cherry-pick` (see below) but mark equivalent commits
211 with `=` rather than omitting them, and inequivalent ones with `+`.
214 Omit any commit that introduces the same change as
215 another commit on the ``other side'' when the set of
216 commits are limited with symmetric difference.
218 For example, if you have two branches, `A` and `B`, a usual way
219 to list all commits on only one side of them is with
220 `--left-right` (see the example below in the description of
221 the `--left-right` option). However, it shows the commits that were
222 cherry-picked from the other branch (for example, ``3rd on b'' may be
223 cherry-picked from branch A). With this option, such pairs of commits are
224 excluded from the output.
228 List only commits on the respective side of a symmetric range,
229 i.e. only those which would be marked `<` resp. `>` by
232 For example, `--cherry-pick --right-only A...B` omits those
233 commits from `B` which are in `A` or are patch-equivalent to a commit in
234 `A`. In other words, this lists the `+` commits from `git cherry A B`.
235 More precisely, `--cherry-pick --right-only --no-merges` gives the exact
239 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`.
247 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',
251 and 'commit1\...commit2' notations cannot be used).
253 With `--pretty` format other than `oneline` (for obvious reasons),
254 this causes the output to have two extra lines of information
255 taken from the reflog. By default, 'commit@\{Nth}' notation is
256 used in the output. When the starting commit is specified as
257 'commit@\{now}', output also uses 'commit@\{timestamp}' notation
258 instead. Under `--pretty=oneline`, the commit message is
259 prefixed with this information on the same line.
260 This option cannot be combined with `--reverse`.
261 See also linkgit:git-reflog[1].
264 After a failed merge, show refs that touch files having a
265 conflict and don't exist on all heads to merge.
268 Output excluded boundary commits. Boundary commits are
271 ifdef::git-rev-list[]
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.
277 endif::git-rev-list[]
281 History Simplification
282 ~~~~~~~~~~~~~~~~~~~~~~
284 Sometimes you are only interested in parts of the history, for example the
285 commits modifying a particular <path>. But there are two parts of
286 'History Simplification', one part is selecting the commits and the other
287 is how to do it, as there are various strategies to simplify the history.
289 The following options select the commits to be shown:
292 Commits modifying the given <paths> are selected.
294 --simplify-by-decoration::
295 Commits that are referred by some branch or tag are selected.
297 Note that extra commits can be shown to give a meaningful history.
299 The following options affect the way the simplification is performed:
302 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)
308 Same as the default mode, but does not prune some history.
311 Only the selected commits are shown, plus some to have a
315 All commits in the simplified history are shown.
318 Additional option to `--full-history` to remove some needless
319 merges from the resulting history, as there are no selected
320 commits contributing to this merge.
323 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'.
329 A more detailed explanation follows.
331 Suppose you specified `foo` as the <paths>. We shall call commits
332 that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
333 filtered for `foo`, they look different and equal, respectively.)
335 In the following, we will always refer to the same example history to
336 illustrate the differences between simplification settings. We assume
337 that you are filtering for a file `foo` in this commit graph:
338 -----------------------------------------------------------------------
339 .-A---M---N---O---P---Q
344 -----------------------------------------------------------------------
345 The horizontal line of history A---Q is taken to be the first parent of
346 each merge. The commits are:
348 * `I` is the initial commit, in which `foo` exists with contents
349 ``asdf'', and a file `quux` exists with contents ``quux''. Initial
350 commits are compared to an empty tree, so `I` is !TREESAME.
352 * In `A`, `foo` contains just ``foo''.
354 * `B` contains the same change as `A`. Its merge `M` is trivial and
355 hence TREESAME to all parents.
357 * `C` does not change `foo`, but its merge `N` changes it to ``foobar'',
358 so it is not TREESAME to any parent.
360 * `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.
363 * `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`.
366 * `X` is an independent root commit that added a new file `side`, and `Y`
367 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`.
370 `rev-list` walks backwards through history, including or excluding
371 commits based on whether `--full-history` and/or parent rewriting
372 (via `--parents` or `--children`) are used. The following settings
376 Commits are included if they are not TREESAME to any parent
377 (though this can be changed, see `--sparse` below). If the
378 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
385 -----------------------------------------------------------------------
389 -----------------------------------------------------------------------
391 Note how the rule to only follow the TREESAME parent, if one is
392 available, removed `B` from consideration entirely. `C` was
393 considered via `N`, but is TREESAME. Root commits are compared to an
394 empty tree, so `I` is !TREESAME.
396 Parent/child relations are only visible with `--parents`, but that does
397 not affect the commits selected in default mode, so we have shown the
400 --full-history without parent rewriting::
401 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
407 -----------------------------------------------------------------------
409 -----------------------------------------------------------------------
411 `M` was excluded because it is TREESAME to both parents. `E`,
412 `C` and `B` were all walked, but only `B` was !TREESAME, so the others
415 Note that without parent rewriting, it is not really possible to talk
416 about the parent/child relationships between the commits, so we show
419 --full-history with parent rewriting::
420 Ordinary commits are only included if they are !TREESAME
421 (though this can be changed, see `--sparse` below).
423 Merges are always included. However, their parent list is rewritten:
424 Along each parent, prune away commits that are not included
425 themselves. This results in
427 -----------------------------------------------------------------------
428 .-A---M---N---O---P---Q
433 -----------------------------------------------------------------------
435 Compare to `--full-history` without rewriting above. Note that `E`
436 was pruned away because it is TREESAME, but the parent list of P was
437 rewritten to contain `E`'s parent `I`. The same happened for `C` and
438 `N`, and `X`, `Y` and `Q`.
440 In addition to the above settings, you can change whether TREESAME
444 Commits that are walked are included if they are not TREESAME
448 All commits that are walked are included.
450 Note that without `--full-history`, this still simplifies merges: if
451 one of the parents is TREESAME, we follow only that one, so the other
452 sides of the merge are never walked.
455 First, build a history graph in the same way that
456 `--full-history` with parent rewriting does (see above).
458 Then simplify each commit `C` to its replacement `C'` in the final
459 history according to the following rules:
464 * Replace each parent `P` of `C'` with its simplification `P'`. In
465 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.
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.
474 The effect of this is best shown by way of comparing to
475 `--full-history` with parent rewriting. The example turns into:
477 -----------------------------------------------------------------------
483 -----------------------------------------------------------------------
485 Note the major differences in `N`, `P`, and `Q` over `--full-history`:
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.
491 * `P`'s parent list similarly had `I` removed. `P` was then
492 removed completely, because it had one parent and is TREESAME.
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.
499 Finally, there is a fifth simplification mode available:
502 Limit the displayed commits to those directly on the ancestry
503 chain between the ``from'' and ``to'' commits in the given commit
504 range. I.e. only display commits that are ancestor of the ``to''
505 commit and descendants of the ``from'' commit.
507 As an example use case, consider the following commit history:
509 -----------------------------------------------------------------------
512 B---C---G---H---I---J
514 A-------K---------------L--M
515 -----------------------------------------------------------------------
517 A regular 'D..M' computes the set of commits that are ancestors of `M`,
518 but excludes the ones that are ancestors of `D`. This is useful to see
519 what happened to the history leading to `M` since `D`, in the sense
520 that ``what does `M` have that did not exist in `D`''. The result in this
521 example would be all the commits, except `A` and `B` (and `D` itself,
524 When we want to find out what commits in `M` are contaminated with the
525 bug introduced by `D` and need fixing, however, we might want to view
526 only the subset of 'D..M' that are actually descendants of `D`, i.e.
527 excluding `C` and `K`. This is exactly what the `--ancestry-path`
528 option does. Applied to the 'D..M' range, it results in:
530 -----------------------------------------------------------------------
536 -----------------------------------------------------------------------
538 The `--simplify-by-decoration` option allows you to view only the
539 big picture of the topology of the history, by omitting commits
540 that are not referenced by tags. Commits are marked as !TREESAME
541 (in other words, kept after history simplification rules described
542 above) if (1) they are referenced by tags, or (2) they change the
543 contents of the paths given on the command line. All other
544 commits are marked as TREESAME (subject to be simplified away).
546 ifdef::git-rev-list[]
551 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
558 -----------------------------------------------------------------------
559 $ git rev-list --bisect foo ^bar ^baz
560 -----------------------------------------------------------------------
562 outputs 'midpoint', the output of the two commands
564 -----------------------------------------------------------------------
565 $ git rev-list foo ^midpoint
566 $ git rev-list midpoint ^bar ^baz
567 -----------------------------------------------------------------------
569 would be of roughly the same length. Finding the change which
570 introduces a regression is thus reduced to a binary search: repeatedly
571 generate and test new 'midpoint's until the commit chain is of length
572 one. Cannot be combined with --first-parent.
575 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
587 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
593 This is useful because it makes it easy to choose a good commit to
594 test when you want to avoid to test some of them for some reason (they
595 may not compile for example).
597 This option can be used along with `--bisect-vars`, in this case,
598 after all the sorted commit objects, there will be the same text as if
599 `--bisect-vars` had been used alone.
600 endif::git-rev-list[]
606 By default, the commits are shown in reverse chronological order.
609 Show no parents before all of its children are shown, but
610 otherwise show commits in the commit timestamp order.
612 --author-date-order::
613 Show no parents before all of its children are shown, but
614 otherwise show commits in the author timestamp order.
617 Show no parents before all of its children are shown, and
618 avoid showing commits on multiple lines of history
621 For example, in a commit history like this:
623 ----------------------------------------------------------------
629 ----------------------------------------------------------------
631 where the numbers denote the order of commit timestamps, `git
632 rev-list` and friends with `--date-order` show the commits in the
633 timestamp order: 8 7 6 5 4 3 2 1.
635 With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
636 3 1); some older commits are shown before newer ones in order to
637 avoid showing the commits from two parallel development track mixed
641 Output the commits in reverse order.
642 Cannot be combined with `--walk-reflogs`.
647 These options are mostly targeted for packing of Git repositories.
649 ifdef::git-rev-list[]
651 Print the object IDs of any object referenced by the listed
652 commits. `--objects foo ^bar` thus means ``send me
653 all object IDs which I need to download if I have the commit
654 object _bar_ but not _foo_''.
657 Similar to `--objects`, but also print the IDs of excluded
658 commits prefixed with a ``-'' character. This is used by
659 linkgit:git-pack-objects[1] to build a ``thin'' pack, which records
660 objects in deltified form based on objects contained in these
661 excluded commits to reduce network traffic.
663 --objects-edge-aggressive::
664 Similar to `--objects-edge`, but it tries harder to find excluded
665 commits at the cost of increased time. This is used instead of
666 `--objects-edge` to build ``thin'' packs for shallow repositories.
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
674 Only useful with `--objects`; print the object IDs that are not
676 endif::git-rev-list[]
678 --no-walk[=(sorted|unsorted)]::
679 Only show the given commits, but do not traverse their ancestors.
680 This has no effect if a range is specified. If the argument
681 `unsorted` is given, the commits are shown in the order they were
682 given on the command line. Otherwise (if `sorted` or no argument
683 was given), the commits are shown in reverse chronological order
685 Cannot be combined with `--graph`.
688 Overrides a previous `--no-walk`.
693 ifdef::git-rev-list[]
694 Using these options, linkgit:git-rev-list[1] will act similar to the
695 more specialized family of commit log tools: linkgit:git-log[1],
696 linkgit:git-show[1], and linkgit:git-whatchanged[1]
697 endif::git-rev-list[]
699 include::pretty-options.txt[]
702 Synonym for `--date=relative`.
704 --date=(relative|local|default|iso|iso-strict|rfc|short|raw)::
705 Only takes effect for dates shown in human-readable format, such
706 as when using `--pretty`. `log.date` config variable sets a default
707 value for the log command's `--date` option.
709 `--date=relative` shows dates relative to the current time,
710 e.g. ``2 hours ago''.
712 `--date=local` shows timestamps in user's local time zone.
714 `--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
715 The differences to the strict ISO 8601 format are:
717 - a space instead of the `T` date/time delimiter
718 - a space between time and time zone
719 - no colon between hours and minutes of the time zone
722 `--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
725 `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
726 format, often found in email messages.
728 `--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
730 `--date=raw` shows the date in the internal raw Git format `%s %z` format.
732 `--date=default` shows timestamps in the original time zone
733 (either committer's or author's).
735 ifdef::git-rev-list[]
737 Print the contents of the commit in raw-format; each record is
738 separated with a NUL character.
739 endif::git-rev-list[]
742 Print also the parents of the commit (in the form "commit parent...").
743 Also enables parent rewriting, see 'History Simplification' below.
746 Print also the children of the commit (in the form "commit child...").
747 Also enables parent rewriting, see 'History Simplification' below.
749 ifdef::git-rev-list[]
751 Print the raw commit timestamp.
752 endif::git-rev-list[]
755 Mark which side of a symmetric diff a commit is reachable from.
756 Commits from the left side are prefixed with `<` and those from
757 the right with `>`. If combined with `--boundary`, those
758 commits are prefixed with `-`.
760 For example, if you have this topology:
762 -----------------------------------------------------------------------
767 o---x---a---a branch A
768 -----------------------------------------------------------------------
770 you would get an output like this:
772 -----------------------------------------------------------------------
773 $ git rev-list --left-right --boundary --pretty=oneline A...B
781 -----------------------------------------------------------------------
784 Draw a text-based graphical representation of the commit history
785 on the left hand side of the output. This may cause extra lines
786 to be printed in between commits, in order for the graph history
787 to be drawn properly.
788 Cannot be combined with `--no-walk`.
790 This enables parent rewriting, see 'History Simplification' below.
792 This implies the `--topo-order` option by default, but the
793 `--date-order` option may also be specified.
795 --show-linear-break[=<barrier>]::
796 When --graph is not used, all history branches are flattened
797 which can make it hard to see that the two consecutive commits
798 do not belong to a linear branch. This option puts a barrier
799 in between them in that case. If `<barrier>` is specified, it
800 is the string that will be shown instead of the default one.
802 ifdef::git-rev-list[]
804 Print a number stating how many commits would have been
805 listed, and suppress all other output. When used together
806 with `--left-right`, instead print the counts for left and
807 right commits, separated by a tab. When used together with
808 `--cherry-mark`, omit patch equivalent commits from these
809 counts and print the count for equivalent commits separated
811 endif::git-rev-list[]
813 ifndef::git-rev-list[]
817 Listed below are options that control the formatting of diff output.
818 Some of them are specific to linkgit:git-rev-list[1], however other diff
819 options may be given. See linkgit:git-diff-files[1] for more options.
822 With this option, diff output for a merge commit
823 shows the differences from each of the parents to the merge result
824 simultaneously instead of showing pairwise diff between a parent
825 and the result one at a time. Furthermore, it lists only files
826 which were modified from all parents.
829 This flag implies the `-c` option and further compresses the
830 patch output by omitting uninteresting hunks whose contents in
831 the parents have only two variants and the merge result picks
832 one of them without modification.
835 This flag makes the merge commits show the full diff like
836 regular commits; for each merge parent, a separate log entry
837 and diff is generated. An exception is that only diff against
838 the first parent is shown when `--first-parent` option is given;
839 in that case, the output represents the changes the merge
840 brought _into_ the then-current branch.
843 Show recursive diffs.
846 Show the tree objects in the diff output. This implies `-r`.
847 endif::git-rev-list[]