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