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