Documentation / rev-list-options.txton commit Merge branch 'maint-1.7.7' into maint-1.7.8 (e521850)
   1Commit Limiting
   2~~~~~~~~~~~~~~~
   3
   4Besides specifying a range of commits that should be listed using the
   5special notations explained in the description, additional commit
   6limiting may be applied. Note that they are applied before commit
   7ordering and formatting options, such as '--reverse'.
   8
   9--
  10
  11-n 'number'::
  12--max-count=<number>::
  13
  14        Limit the number of commits to output.
  15
  16--skip=<number>::
  17
  18        Skip 'number' commits before starting to show the commit output.
  19
  20--since=<date>::
  21--after=<date>::
  22
  23        Show commits more recent than a specific date.
  24
  25--until=<date>::
  26--before=<date>::
  27
  28        Show commits older than a specific date.
  29
  30ifdef::git-rev-list[]
  31--max-age=<timestamp>::
  32--min-age=<timestamp>::
  33
  34        Limit the commits output to specified time range.
  35endif::git-rev-list[]
  36
  37--author=<pattern>::
  38--committer=<pattern>::
  39
  40        Limit the commits output to ones with author/committer
  41        header lines that match the specified pattern (regular expression).
  42
  43--grep=<pattern>::
  44
  45        Limit the commits output to ones with log message that
  46        matches the specified pattern (regular expression).
  47
  48--all-match::
  49        Limit the commits output to ones that match all given --grep,
  50        --author and --committer instead of ones that match at least one.
  51
  52-i::
  53--regexp-ignore-case::
  54
  55        Match the regexp limiting patterns without regard to letters case.
  56
  57-E::
  58--extended-regexp::
  59
  60        Consider the limiting patterns to be extended regular expressions
  61        instead of the default basic regular expressions.
  62
  63-F::
  64--fixed-strings::
  65
  66        Consider the limiting patterns to be fixed strings (don't interpret
  67        pattern as a regular expression).
  68
  69--remove-empty::
  70
  71        Stop when a given path disappears from the tree.
  72
  73--merges::
  74
  75        Print only merge commits. This is exactly the same as `--min-parents=2`.
  76
  77--no-merges::
  78
  79        Do not print commits with more than one parent. This is
  80        exactly the same as `--max-parents=1`.
  81
  82--min-parents=<number>::
  83--max-parents=<number>::
  84--no-min-parents::
  85--no-max-parents::
  86
  87        Show only commits which have at least (or at most) that many
  88        commits. In particular, `--max-parents=1` is the same as `--no-merges`,
  89        `--min-parents=2` is the same as `--merges`.  `--max-parents=0`
  90        gives all root commits and `--min-parents=3` all octopus merges.
  91+
  92`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
  93again.  Equivalent forms are `--min-parents=0` (any commit has 0 or more
  94parents) and `--max-parents=-1` (negative numbers denote no upper limit).
  95
  96--first-parent::
  97        Follow only the first parent commit upon seeing a merge
  98        commit.  This option can give a better overview when
  99        viewing the evolution of a particular topic branch,
 100        because merges into a topic branch tend to be only about
 101        adjusting to updated upstream from time to time, and
 102        this option allows you to ignore the individual commits
 103        brought in to your history by such a merge.
 104
 105--not::
 106
 107        Reverses the meaning of the '{caret}' prefix (or lack thereof)
 108        for all following revision specifiers, up to the next '--not'.
 109
 110--all::
 111
 112        Pretend as if all the refs in `refs/` are listed on the
 113        command line as '<commit>'.
 114
 115--branches[=<pattern>]::
 116
 117        Pretend as if all the refs in `refs/heads` are listed
 118        on the command line as '<commit>'. If '<pattern>' is given, limit
 119        branches to ones matching given shell glob. If pattern lacks '?',
 120        '*', or '[', '/*' at the end is implied.
 121
 122--tags[=<pattern>]::
 123
 124        Pretend as if all the refs in `refs/tags` are listed
 125        on the command line as '<commit>'. If '<pattern>' is given, limit
 126        tags to ones matching given shell glob. If pattern lacks '?', '*',
 127        or '[', '/*' at the end is implied.
 128
 129--remotes[=<pattern>]::
 130
 131        Pretend as if all the refs in `refs/remotes` are listed
 132        on the command line as '<commit>'. If '<pattern>' is given, limit
 133        remote-tracking branches to ones matching given shell glob.
 134        If pattern lacks '?', '*', or '[', '/*' at the end is implied.
 135
 136--glob=<glob-pattern>::
 137        Pretend as if all the refs matching shell glob '<glob-pattern>'
 138        are listed on the command line as '<commit>'. Leading 'refs/',
 139        is automatically prepended if missing. If pattern lacks '?', '*',
 140        or '[', '/*' at the end is implied.
 141
 142--ignore-missing::
 143
 144        Upon seeing an invalid object name in the input, pretend as if
 145        the bad input was not given.
 146
 147ifndef::git-rev-list[]
 148--bisect::
 149
 150        Pretend as if the bad bisection ref `refs/bisect/bad`
 151        was listed and as if it was followed by `--not` and the good
 152        bisection refs `refs/bisect/good-*` on the command
 153        line.
 154endif::git-rev-list[]
 155
 156--stdin::
 157
 158        In addition to the '<commit>' listed on the command
 159        line, read them from the standard input. If a '--' separator is
 160        seen, stop reading commits and start reading paths to limit the
 161        result.
 162
 163ifdef::git-rev-list[]
 164--quiet::
 165
 166        Don't print anything to standard output.  This form
 167        is primarily meant to allow the caller to
 168        test the exit status to see if a range of objects is fully
 169        connected (or not).  It is faster than redirecting stdout
 170        to /dev/null as the output does not have to be formatted.
 171endif::git-rev-list[]
 172
 173--cherry-mark::
 174
 175        Like `--cherry-pick` (see below) but mark equivalent commits
 176        with `=` rather than omitting them, and inequivalent ones with `+`.
 177
 178--cherry-pick::
 179
 180        Omit any commit that introduces the same change as
 181        another commit on the "other side" when the set of
 182        commits are limited with symmetric difference.
 183+
 184For example, if you have two branches, `A` and `B`, a usual way
 185to list all commits on only one side of them is with
 186`--left-right` (see the example below in the description of
 187the `--left-right` option).  It however shows the commits that were cherry-picked
 188from the other branch (for example, "3rd on b" may be cherry-picked
 189from branch A).  With this option, such pairs of commits are
 190excluded from the output.
 191
 192--left-only::
 193--right-only::
 194
 195        List only commits on the respective side of a symmetric range,
 196        i.e. only those which would be marked `<` resp. `>` by
 197        `--left-right`.
 198+
 199For example, `--cherry-pick --right-only A...B` omits those
 200commits from `B` which are in `A` or are patch-equivalent to a commit in
 201`A`. In other words, this lists the `{plus}` commits from `git cherry A B`.
 202More precisely, `--cherry-pick --right-only --no-merges` gives the exact
 203list.
 204
 205--cherry::
 206
 207        A synonym for `--right-only --cherry-mark --no-merges`; useful to
 208        limit the output to the commits on our side and mark those that
 209        have been applied to the other side of a forked history with
 210        `git log --cherry upstream...mybranch`, similar to
 211        `git cherry upstream mybranch`.
 212
 213-g::
 214--walk-reflogs::
 215
 216        Instead of walking the commit ancestry chain, walk
 217        reflog entries from the most recent one to older ones.
 218        When this option is used you cannot specify commits to
 219        exclude (that is, '{caret}commit', 'commit1..commit2',
 220        nor 'commit1\...commit2' notations cannot be used).
 221+
 222With '\--pretty' format other than oneline (for obvious reasons),
 223this causes the output to have two extra lines of information
 224taken from the reflog.  By default, 'commit@\{Nth}' notation is
 225used in the output.  When the starting commit is specified as
 226'commit@\{now}', output also uses 'commit@\{timestamp}' notation
 227instead.  Under '\--pretty=oneline', the commit message is
 228prefixed with this information on the same line.
 229This option cannot be combined with '\--reverse'.
 230See also linkgit:git-reflog[1].
 231
 232--merge::
 233
 234        After a failed merge, show refs that touch files having a
 235        conflict and don't exist on all heads to merge.
 236
 237--boundary::
 238
 239        Output uninteresting commits at the boundary, which are usually
 240        not shown.
 241
 242--
 243
 244History Simplification
 245~~~~~~~~~~~~~~~~~~~~~~
 246
 247Sometimes you are only interested in parts of the history, for example the
 248commits modifying a particular <path>. But there are two parts of
 249'History Simplification', one part is selecting the commits and the other
 250is how to do it, as there are various strategies to simplify the history.
 251
 252The following options select the commits to be shown:
 253
 254<paths>::
 255
 256        Commits modifying the given <paths> are selected.
 257
 258--simplify-by-decoration::
 259
 260        Commits that are referred by some branch or tag are selected.
 261
 262Note that extra commits can be shown to give a meaningful history.
 263
 264The following options affect the way the simplification is performed:
 265
 266Default mode::
 267
 268        Simplifies the history to the simplest history explaining the
 269        final state of the tree. Simplest because it prunes some side
 270        branches if the end result is the same (i.e. merging branches
 271        with the same content)
 272
 273--full-history::
 274
 275        Same as the default mode, but does not prune some history.
 276
 277--dense::
 278
 279        Only the selected commits are shown, plus some to have a
 280        meaningful history.
 281
 282--sparse::
 283
 284        All commits in the simplified history are shown.
 285
 286--simplify-merges::
 287
 288        Additional option to '--full-history' to remove some needless
 289        merges from the resulting history, as there are no selected
 290        commits contributing to this merge.
 291
 292--ancestry-path::
 293
 294        When given a range of commits to display (e.g. 'commit1..commit2'
 295        or 'commit2 {caret}commit1'), only display commits that exist
 296        directly on the ancestry chain between the 'commit1' and
 297        'commit2', i.e. commits that are both descendants of 'commit1',
 298        and ancestors of 'commit2'.
 299
 300A more detailed explanation follows.
 301
 302Suppose you specified `foo` as the <paths>.  We shall call commits
 303that modify `foo` !TREESAME, and the rest TREESAME.  (In a diff
 304filtered for `foo`, they look different and equal, respectively.)
 305
 306In the following, we will always refer to the same example history to
 307illustrate the differences between simplification settings.  We assume
 308that you are filtering for a file `foo` in this commit graph:
 309-----------------------------------------------------------------------
 310          .-A---M---N---O---P
 311         /     /   /   /   /
 312        I     B   C   D   E
 313         \   /   /   /   /
 314          `-------------'
 315-----------------------------------------------------------------------
 316The horizontal line of history A---P is taken to be the first parent of
 317each merge.  The commits are:
 318
 319* `I` is the initial commit, in which `foo` exists with contents
 320  "asdf", and a file `quux` exists with contents "quux".  Initial
 321  commits are compared to an empty tree, so `I` is !TREESAME.
 322
 323* In `A`, `foo` contains just "foo".
 324
 325* `B` contains the same change as `A`.  Its merge `M` is trivial and
 326  hence TREESAME to all parents.
 327
 328* `C` does not change `foo`, but its merge `N` changes it to "foobar",
 329  so it is not TREESAME to any parent.
 330
 331* `D` sets `foo` to "baz".  Its merge `O` combines the strings from
 332  `N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.
 333
 334* `E` changes `quux` to "xyzzy", and its merge `P` combines the
 335  strings to "quux xyzzy".  Despite appearing interesting, `P` is
 336  TREESAME to all parents.
 337
 338'rev-list' walks backwards through history, including or excluding
 339commits based on whether '\--full-history' and/or parent rewriting
 340(via '\--parents' or '\--children') are used.  The following settings
 341are available.
 342
 343Default mode::
 344
 345        Commits are included if they are not TREESAME to any parent
 346        (though this can be changed, see '\--sparse' below).  If the
 347        commit was a merge, and it was TREESAME to one parent, follow
 348        only that parent.  (Even if there are several TREESAME
 349        parents, follow only one of them.)  Otherwise, follow all
 350        parents.
 351+
 352This results in:
 353+
 354-----------------------------------------------------------------------
 355          .-A---N---O
 356         /     /   /
 357        I---------D
 358-----------------------------------------------------------------------
 359+
 360Note how the rule to only follow the TREESAME parent, if one is
 361available, removed `B` from consideration entirely.  `C` was
 362considered via `N`, but is TREESAME.  Root commits are compared to an
 363empty tree, so `I` is !TREESAME.
 364+
 365Parent/child relations are only visible with --parents, but that does
 366not affect the commits selected in default mode, so we have shown the
 367parent lines.
 368
 369--full-history without parent rewriting::
 370
 371        This mode differs from the default in one point: always follow
 372        all parents of a merge, even if it is TREESAME to one of them.
 373        Even if more than one side of the merge has commits that are
 374        included, this does not imply that the merge itself is!  In
 375        the example, we get
 376+
 377-----------------------------------------------------------------------
 378        I  A  B  N  D  O
 379-----------------------------------------------------------------------
 380+
 381`P` and `M` were excluded because they are TREESAME to a parent.  `E`,
 382`C` and `B` were all walked, but only `B` was !TREESAME, so the others
 383do not appear.
 384+
 385Note that without parent rewriting, it is not really possible to talk
 386about the parent/child relationships between the commits, so we show
 387them disconnected.
 388
 389--full-history with parent rewriting::
 390
 391        Ordinary commits are only included if they are !TREESAME
 392        (though this can be changed, see '\--sparse' below).
 393+
 394Merges are always included.  However, their parent list is rewritten:
 395Along each parent, prune away commits that are not included
 396themselves.  This results in
 397+
 398-----------------------------------------------------------------------
 399          .-A---M---N---O---P
 400         /     /   /   /   /
 401        I     B   /   D   /
 402         \   /   /   /   /
 403          `-------------'
 404-----------------------------------------------------------------------
 405+
 406Compare to '\--full-history' without rewriting above.  Note that `E`
 407was pruned away because it is TREESAME, but the parent list of P was
 408rewritten to contain `E`'s parent `I`.  The same happened for `C` and
 409`N`.  Note also that `P` was included despite being TREESAME.
 410
 411In addition to the above settings, you can change whether TREESAME
 412affects inclusion:
 413
 414--dense::
 415
 416        Commits that are walked are included if they are not TREESAME
 417        to any parent.
 418
 419--sparse::
 420
 421        All commits that are walked are included.
 422+
 423Note that without '\--full-history', this still simplifies merges: if
 424one of the parents is TREESAME, we follow only that one, so the other
 425sides of the merge are never walked.
 426
 427--simplify-merges::
 428
 429        First, build a history graph in the same way that
 430        '\--full-history' with parent rewriting does (see above).
 431+
 432Then simplify each commit `C` to its replacement `C'` in the final
 433history according to the following rules:
 434+
 435--
 436* Set `C'` to `C`.
 437+
 438* Replace each parent `P` of `C'` with its simplification `P'`.  In
 439  the process, drop parents that are ancestors of other parents, and
 440  remove duplicates.
 441+
 442* If after this parent rewriting, `C'` is a root or merge commit (has
 443  zero or >1 parents), a boundary commit, or !TREESAME, it remains.
 444  Otherwise, it is replaced with its only parent.
 445--
 446+
 447The effect of this is best shown by way of comparing to
 448'\--full-history' with parent rewriting.  The example turns into:
 449+
 450-----------------------------------------------------------------------
 451          .-A---M---N---O
 452         /     /       /
 453        I     B       D
 454         \   /       /
 455          `---------'
 456-----------------------------------------------------------------------
 457+
 458Note the major differences in `N` and `P` over '\--full-history':
 459+
 460--
 461* `N`'s parent list had `I` removed, because it is an ancestor of the
 462  other parent `M`.  Still, `N` remained because it is !TREESAME.
 463+
 464* `P`'s parent list similarly had `I` removed.  `P` was then
 465  removed completely, because it had one parent and is TREESAME.
 466--
 467
 468Finally, there is a fifth simplification mode available:
 469
 470--ancestry-path::
 471
 472        Limit the displayed commits to those directly on the ancestry
 473        chain between the "from" and "to" commits in the given commit
 474        range. I.e. only display commits that are ancestor of the "to"
 475        commit, and descendants of the "from" commit.
 476+
 477As an example use case, consider the following commit history:
 478+
 479-----------------------------------------------------------------------
 480            D---E-------F
 481           /     \       \
 482          B---C---G---H---I---J
 483         /                     \
 484        A-------K---------------L--M
 485-----------------------------------------------------------------------
 486+
 487A regular 'D..M' computes the set of commits that are ancestors of `M`,
 488but excludes the ones that are ancestors of `D`. This is useful to see
 489what happened to the history leading to `M` since `D`, in the sense
 490that "what does `M` have that did not exist in `D`". The result in this
 491example would be all the commits, except `A` and `B` (and `D` itself,
 492of course).
 493+
 494When we want to find out what commits in `M` are contaminated with the
 495bug introduced by `D` and need fixing, however, we might want to view
 496only the subset of 'D..M' that are actually descendants of `D`, i.e.
 497excluding `C` and `K`. This is exactly what the '\--ancestry-path'
 498option does. Applied to the 'D..M' range, it results in:
 499+
 500-----------------------------------------------------------------------
 501                E-------F
 502                 \       \
 503                  G---H---I---J
 504                               \
 505                                L--M
 506-----------------------------------------------------------------------
 507
 508The '\--simplify-by-decoration' option allows you to view only the
 509big picture of the topology of the history, by omitting commits
 510that are not referenced by tags.  Commits are marked as !TREESAME
 511(in other words, kept after history simplification rules described
 512above) if (1) they are referenced by tags, or (2) they change the
 513contents of the paths given on the command line.  All other
 514commits are marked as TREESAME (subject to be simplified away).
 515
 516ifdef::git-rev-list[]
 517Bisection Helpers
 518~~~~~~~~~~~~~~~~~
 519
 520--bisect::
 521
 522Limit output to the one commit object which is roughly halfway between
 523included and excluded commits. Note that the bad bisection ref
 524`refs/bisect/bad` is added to the included commits (if it
 525exists) and the good bisection refs `refs/bisect/good-*` are
 526added to the excluded commits (if they exist). Thus, supposing there
 527are no refs in `refs/bisect/`, if
 528
 529-----------------------------------------------------------------------
 530        $ git rev-list --bisect foo ^bar ^baz
 531-----------------------------------------------------------------------
 532
 533outputs 'midpoint', the output of the two commands
 534
 535-----------------------------------------------------------------------
 536        $ git rev-list foo ^midpoint
 537        $ git rev-list midpoint ^bar ^baz
 538-----------------------------------------------------------------------
 539
 540would be of roughly the same length.  Finding the change which
 541introduces a regression is thus reduced to a binary search: repeatedly
 542generate and test new 'midpoint's until the commit chain is of length
 543one.
 544
 545--bisect-vars::
 546
 547This calculates the same as `--bisect`, except that refs in
 548`refs/bisect/` are not used, and except that this outputs
 549text ready to be eval'ed by the shell. These lines will assign the
 550name of the midpoint revision to the variable `bisect_rev`, and the
 551expected number of commits to be tested after `bisect_rev` is tested
 552to `bisect_nr`, the expected number of commits to be tested if
 553`bisect_rev` turns out to be good to `bisect_good`, the expected
 554number of commits to be tested if `bisect_rev` turns out to be bad to
 555`bisect_bad`, and the number of commits we are bisecting right now to
 556`bisect_all`.
 557
 558--bisect-all::
 559
 560This outputs all the commit objects between the included and excluded
 561commits, ordered by their distance to the included and excluded
 562commits. Refs in `refs/bisect/` are not used. The farthest
 563from them is displayed first. (This is the only one displayed by
 564`--bisect`.)
 565+
 566This is useful because it makes it easy to choose a good commit to
 567test when you want to avoid to test some of them for some reason (they
 568may not compile for example).
 569+
 570This option can be used along with `--bisect-vars`, in this case,
 571after all the sorted commit objects, there will be the same text as if
 572`--bisect-vars` had been used alone.
 573endif::git-rev-list[]
 574
 575
 576Commit Ordering
 577~~~~~~~~~~~~~~~
 578
 579By default, the commits are shown in reverse chronological order.
 580
 581--topo-order::
 582
 583        This option makes them appear in topological order (i.e.
 584        descendant commits are shown before their parents).
 585
 586--date-order::
 587
 588        This option is similar to '--topo-order' in the sense that no
 589        parent comes before all of its children, but otherwise things
 590        are still ordered in the commit timestamp order.
 591
 592--reverse::
 593
 594        Output the commits in reverse order.
 595        Cannot be combined with '\--walk-reflogs'.
 596
 597Object Traversal
 598~~~~~~~~~~~~~~~~
 599
 600These options are mostly targeted for packing of git repositories.
 601
 602--objects::
 603
 604        Print the object IDs of any object referenced by the listed
 605        commits.  '--objects foo ^bar' thus means "send me
 606        all object IDs which I need to download if I have the commit
 607        object 'bar', but not 'foo'".
 608
 609--objects-edge::
 610
 611        Similar to '--objects', but also print the IDs of excluded
 612        commits prefixed with a "-" character.  This is used by
 613        linkgit:git-pack-objects[1] to build "thin" pack, which records
 614        objects in deltified form based on objects contained in these
 615        excluded commits to reduce network traffic.
 616
 617--unpacked::
 618
 619        Only useful with '--objects'; print the object IDs that are not
 620        in packs.
 621
 622--no-walk::
 623
 624        Only show the given revs, but do not traverse their ancestors.
 625
 626--do-walk::
 627
 628        Overrides a previous --no-walk.
 629
 630Commit Formatting
 631~~~~~~~~~~~~~~~~~
 632
 633ifdef::git-rev-list[]
 634Using these options, linkgit:git-rev-list[1] will act similar to the
 635more specialized family of commit log tools: linkgit:git-log[1],
 636linkgit:git-show[1], and linkgit:git-whatchanged[1]
 637endif::git-rev-list[]
 638
 639include::pretty-options.txt[]
 640
 641--relative-date::
 642
 643        Synonym for `--date=relative`.
 644
 645--date=(relative|local|default|iso|rfc|short|raw)::
 646
 647        Only takes effect for dates shown in human-readable format, such
 648        as when using "--pretty". `log.date` config variable sets a default
 649        value for log command's --date option.
 650+
 651`--date=relative` shows dates relative to the current time,
 652e.g. "2 hours ago".
 653+
 654`--date=local` shows timestamps in user's local timezone.
 655+
 656`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.
 657+
 658`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
 659format, often found in E-mail messages.
 660+
 661`--date=short` shows only date but not time, in `YYYY-MM-DD` format.
 662+
 663`--date=raw` shows the date in the internal raw git format `%s %z` format.
 664+
 665`--date=default` shows timestamps in the original timezone
 666(either committer's or author's).
 667
 668ifdef::git-rev-list[]
 669--header::
 670
 671        Print the contents of the commit in raw-format; each record is
 672        separated with a NUL character.
 673endif::git-rev-list[]
 674
 675--parents::
 676
 677        Print also the parents of the commit (in the form "commit parent...").
 678        Also enables parent rewriting, see 'History Simplification' below.
 679
 680--children::
 681
 682        Print also the children of the commit (in the form "commit child...").
 683        Also enables parent rewriting, see 'History Simplification' below.
 684
 685ifdef::git-rev-list[]
 686--timestamp::
 687        Print the raw commit timestamp.
 688endif::git-rev-list[]
 689
 690--left-right::
 691
 692        Mark which side of a symmetric diff a commit is reachable from.
 693        Commits from the left side are prefixed with `<` and those from
 694        the right with `>`.  If combined with `--boundary`, those
 695        commits are prefixed with `-`.
 696+
 697For example, if you have this topology:
 698+
 699-----------------------------------------------------------------------
 700             y---b---b  branch B
 701            / \ /
 702           /   .
 703          /   / \
 704         o---x---a---a  branch A
 705-----------------------------------------------------------------------
 706+
 707you would get an output like this:
 708+
 709-----------------------------------------------------------------------
 710        $ git rev-list --left-right --boundary --pretty=oneline A...B
 711
 712        >bbbbbbb... 3rd on b
 713        >bbbbbbb... 2nd on b
 714        <aaaaaaa... 3rd on a
 715        <aaaaaaa... 2nd on a
 716        -yyyyyyy... 1st on b
 717        -xxxxxxx... 1st on a
 718-----------------------------------------------------------------------
 719
 720--graph::
 721
 722        Draw a text-based graphical representation of the commit history
 723        on the left hand side of the output.  This may cause extra lines
 724        to be printed in between commits, in order for the graph history
 725        to be drawn properly.
 726+
 727This enables parent rewriting, see 'History Simplification' below.
 728+
 729This implies the '--topo-order' option by default, but the
 730'--date-order' option may also be specified.
 731
 732ifdef::git-rev-list[]
 733--count::
 734        Print a number stating how many commits would have been
 735        listed, and suppress all other output.  When used together
 736        with '--left-right', instead print the counts for left and
 737        right commits, separated by a tab. When used together with
 738        '--cherry-mark', omit patch equivalent commits from these
 739        counts and print the count for equivalent commits separated
 740        by a tab.
 741endif::git-rev-list[]
 742
 743
 744ifndef::git-rev-list[]
 745Diff Formatting
 746~~~~~~~~~~~~~~~
 747
 748Below are listed options that control the formatting of diff output.
 749Some of them are specific to linkgit:git-rev-list[1], however other diff
 750options may be given. See linkgit:git-diff-files[1] for more options.
 751
 752-c::
 753
 754        With this option, diff output for a merge commit
 755        shows the differences from each of the parents to the merge result
 756        simultaneously instead of showing pairwise diff between a parent
 757        and the result one at a time. Furthermore, it lists only files
 758        which were modified from all parents.
 759
 760--cc::
 761
 762        This flag implies the '-c' options and further compresses the
 763        patch output by omitting uninteresting hunks whose contents in
 764        the parents have only two variants and the merge result picks
 765        one of them without modification.
 766
 767-m::
 768
 769        This flag makes the merge commits show the full diff like
 770        regular commits; for each merge parent, a separate log entry
 771        and diff is generated. An exception is that only diff against
 772        the first parent is shown when '--first-parent' option is given;
 773        in that case, the output represents the changes the merge
 774        brought _into_ the then-current branch.
 775
 776-r::
 777
 778        Show recursive diffs.
 779
 780-t::
 781
 782        Show the tree objects in the diff output. This implies '-r'.
 783
 784-s::
 785        Suppress diff output.
 786endif::git-rev-list[]