1 <?xml version=
"1.0" encoding=
"UTF-8"?>
2 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
6 <meta http-equiv=
"Content-Type" content=
"application/xhtml+xml; charset=UTF-8" />
7 <meta name=
"generator" content=
"AsciiDoc 10.2.0" />
8 <title>git-shortlog(
1)
</title>
9 <style type=
"text/css">
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
14 font-family: Georgia,serif;
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
22 #author, #revnumber, #revdate, #revremark,
24 font-family: Arial,Helvetica,sans-serif;
28 margin:
1em
5%
1em
5%;
33 text-decoration: underline;
49 h1, h2, h3, h4, h5, h6 {
57 border-bottom:
2px solid silver;
77 border:
1px solid silver;
88 ul
> li { color: #aaa; }
89 ul
> li
> * { color: black; }
91 .monospaced, code, pre {
92 font-family:
"Courier New", Courier, monospace;
99 white-space: pre-wrap;
109 #revnumber, #revdate, #revremark {
114 border-top:
2px solid silver;
120 padding-bottom:
0.5em;
124 padding-bottom:
0.5em;
129 margin-bottom:
1.5em;
131 div.imageblock, div.exampleblock, div.verseblock,
132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133 div.admonitionblock {
135 margin-bottom:
1.5em;
137 div.admonitionblock {
139 margin-bottom:
2.0em;
144 div.content { /* Block element content. */
148 /* Block element titles. */
149 div.title, caption.title {
154 margin-bottom:
0.5em;
160 td div.title:first-child {
163 div.content div.title:first-child {
166 div.content + div.title {
170 div.sidebarblock
> div.content {
172 border:
1px solid #dddddd;
173 border-left:
4px solid #f0f0f0;
177 div.listingblock
> div.content {
178 border:
1px solid #dddddd;
179 border-left:
5px solid #f0f0f0;
184 div.quoteblock, div.verseblock {
188 border-left:
5px solid #f0f0f0;
192 div.quoteblock
> div.attribution {
197 div.verseblock
> pre.content {
198 font-family: inherit;
201 div.verseblock
> div.attribution {
205 /* DEPRECATED: Pre version
8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
210 div.admonitionblock .icon {
214 text-decoration: underline;
216 padding-right:
0.5em;
218 div.admonitionblock td.content {
220 border-left:
3px solid #dddddd;
223 div.exampleblock
> div.content {
224 border-left:
3px solid #dddddd;
228 div.imageblock div.content { padding-left:
0; }
229 span.image img { border-style: none; vertical-align: text-bottom; }
230 a.image:visited { color: white; }
234 margin-bottom:
0.8em;
247 list-style-position: outside;
250 list-style-type: decimal;
253 list-style-type: lower-alpha;
256 list-style-type: upper-alpha;
259 list-style-type: lower-roman;
262 list-style-type: upper-roman;
265 div.compact ul, div.compact ol,
266 div.compact p, div.compact p,
267 div.compact div, div.compact div {
269 margin-bottom:
0.1em;
281 margin-bottom:
0.8em;
284 padding-bottom:
15px;
286 dt.hdlist1.strong, td.hdlist1.strong {
292 padding-right:
0.8em;
298 div.hdlist.compact tr {
307 .footnote, .footnoteref {
311 span.footnote, span.footnoteref {
312 vertical-align: super;
316 margin:
20px
0 20px
0;
320 #footnotes div.footnote {
326 border-top:
1px solid silver;
335 padding-right:
0.5em;
336 padding-bottom:
0.3em;
344 #footer-badges { display: none; }
348 margin-bottom:
2.5em;
356 margin-bottom:
0.1em;
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
376 span.aqua { color: aqua; }
377 span.black { color: black; }
378 span.blue { color: blue; }
379 span.fuchsia { color: fuchsia; }
380 span.gray { color: gray; }
381 span.green { color: green; }
382 span.lime { color: lime; }
383 span.maroon { color: maroon; }
384 span.navy { color: navy; }
385 span.olive { color: olive; }
386 span.purple { color: purple; }
387 span.red { color: red; }
388 span.silver { color: silver; }
389 span.teal { color: teal; }
390 span.white { color: white; }
391 span.yellow { color: yellow; }
393 span.aqua-background { background: aqua; }
394 span.black-background { background: black; }
395 span.blue-background { background: blue; }
396 span.fuchsia-background { background: fuchsia; }
397 span.gray-background { background: gray; }
398 span.green-background { background: green; }
399 span.lime-background { background: lime; }
400 span.maroon-background { background: maroon; }
401 span.navy-background { background: navy; }
402 span.olive-background { background: olive; }
403 span.purple-background { background: purple; }
404 span.red-background { background: red; }
405 span.silver-background { background: silver; }
406 span.teal-background { background: teal; }
407 span.white-background { background: white; }
408 span.yellow-background { background: yellow; }
410 span.big { font-size:
2em; }
411 span.small { font-size:
0.6em; }
413 span.underline { text-decoration: underline; }
414 span.overline { text-decoration: overline; }
415 span.line-through { text-decoration: line-through; }
417 div.unbreakable { page-break-inside: avoid; }
427 margin-bottom:
1.5em;
429 div.tableblock
> table {
430 border:
3px solid #
527bbd;
432 thead, p.table.header {
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
440 div.tableblock
> table[
frame=
"void"] {
443 div.tableblock
> table[
frame=
"hsides"] {
444 border-left-style: none;
445 border-right-style: none;
447 div.tableblock
> table[
frame=
"vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
460 margin-bottom:
1.5em;
462 thead, p.tableblock.header {
473 border-color: #
527bbd;
474 border-collapse: collapse;
476 th.tableblock, td.tableblock {
480 border-color: #
527bbd;
483 table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
487 table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
491 table.tableblock.frame-none {
492 border-style: hidden;
495 th.tableblock.halign-left, td.tableblock.halign-left {
498 th.tableblock.halign-center, td.tableblock.halign-center {
501 th.tableblock.halign-right, td.tableblock.halign-right {
505 th.tableblock.valign-top, td.tableblock.valign-top {
508 th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
523 padding-bottom:
0.5em;
524 border-top:
2px solid silver;
525 border-bottom:
2px solid silver;
530 body.manpage div.sectionbody {
535 body.manpage div#toc { display: none; }
540 <script type=
"text/javascript">
542 var asciidoc = { // Namespace.
544 /////////////////////////////////////////////////////////////////////
545 // Table Of Contents generator
546 /////////////////////////////////////////////////////////////////////
548 /* Author: Mihai Bazon, September
2002
549 * http://students.infoiasi.ro/~mishoo
551 * Table Of Content generator
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
558 /* modified by Troy D. Hanson, September
2006. License: GPL */
559 /* modified by Stuart Rackham,
2006,
2009. License: GPL */
562 toc: function (toclevels) {
564 function getText(el) {
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType ==
3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
569 else if (i.firstChild != null)
575 function TocEntry(el, text, toclevel) {
578 this.toclevel = toclevel;
581 function tocEntries(el, toclevels) {
582 var result = new Array;
583 var re = new RegExp('[hH]([
1-'+(toclevels+
1)+'])');
584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType ==
1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute(
"class") || i.getAttribute(
"className")) !=
"float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[
1]-
1);
602 var toc = document.getElementById(
"toc");
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
610 for (i =
0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
612 if (entry.nodeName.toLowerCase() == 'div'
613 && entry.getAttribute(
"class")
614 && entry.getAttribute(
"class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
617 for (i =
0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
621 // Rebuild TOC entries.
622 var entries = tocEntries(document.getElementById(
"content"), toclevels);
623 for (var i =
0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id ==
"")
626 entry.element.id =
"_toc_" + i;
627 var a = document.createElement(
"a");
628 a.href =
"#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement(
"div");
632 div.className =
"toclevel" + entry.toclevel;
633 toc.appendChild(div);
635 if (entries.length ==
0)
636 toc.parentNode.removeChild(toc);
640 /////////////////////////////////////////////////////////////////////
641 // Footnotes generator
642 /////////////////////////////////////////////////////////////////////
644 /* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/
2005/
07/format_footnote.html
648 footnotes: function () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
651 var noteholder = document.getElementById(
"footnotes");
655 var entriesToRemove = [];
656 for (i =
0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute(
"class") ==
"footnote")
659 entriesToRemove.push(entry);
661 for (i =
0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
665 // Rebuild footnote entries.
666 var cont = document.getElementById(
"content");
667 var spans = cont.getElementsByTagName(
"span");
670 for (i=
0; i
<spans.length; i++) {
671 if (spans[i].className ==
"footnote") {
673 var note = spans[i].getAttribute(
"data-note");
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[
1];
679 "[<a id='_footnoteref_" + n +
"' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n +
"</a>]";
681 spans[i].setAttribute(
"data-note", note);
683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n +
"'>" +
685 "<a href='#_footnoteref_" + n +
"' title='Return to text'>" +
686 n +
"</a>. " + note +
"</div>";
687 var id =spans[i].getAttribute(
"id");
688 if (id != null) refs[
"#"+id] = n;
692 noteholder.parentNode.removeChild(noteholder);
694 // Process footnoterefs.
695 for (i=
0; i
<spans.length; i++) {
696 if (spans[i].className ==
"footnoteref") {
697 var href = spans[i].getElementsByTagName(
"a")[
0].getAttribute(
"href");
698 href = href.match(/#.*/)[
0]; // Because IE return full URL.
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n +
"</a>]";
708 install: function(toclevels) {
711 function reinstall() {
712 asciidoc.footnotes();
714 asciidoc.toc(toclevels);
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
723 timerId = setInterval(reinstall,
500);
724 if (document.addEventListener)
725 document.addEventListener(
"DOMContentLoaded", reinstallAndRemoveTimer, false);
727 window.onload = reinstallAndRemoveTimer;
735 <body class=
"manpage">
738 git-shortlog(
1) Manual Page
741 <div class=
"sectionbody">
743 Summarize 'git log' output
749 <h2 id=
"_synopsis">SYNOPSIS
</h2>
750 <div class=
"sectionbody">
751 <div class=
"verseblock">
752 <pre class=
"content"><em>git shortlog
</em> [
<options
>] [
<revision-range
>] [[--]
<path
>…]
753 git log --pretty=short |
<em>git shortlog
</em> [
<options
>]
</pre>
754 <div class=
"attribution">
759 <h2 id=
"_description">DESCRIPTION
</h2>
760 <div class=
"sectionbody">
761 <div class=
"paragraph"><p>Summarizes
<em>git log
</em> output in a format suitable for inclusion
762 in release announcements. Each commit will be grouped by author and title.
</p></div>
763 <div class=
"paragraph"><p>Additionally,
"[PATCH]" will be stripped from the commit description.
</p></div>
764 <div class=
"paragraph"><p>If no revisions are passed on the command line and either standard input
765 is not a terminal or there is no current branch,
<em>git shortlog
</em> will
766 output a summary of the log read from standard input, without
767 reference to the current repository.
</p></div>
771 <h2 id=
"_options">OPTIONS
</h2>
772 <div class=
"sectionbody">
773 <div class=
"dlist"><dl>
782 Sort output according to the number of commits per author instead
783 of author alphabetic order.
794 Suppress commit description and provide a commit count summary only.
805 Show the email address of each author.
809 --format[=
<format
>]
813 Instead of the commit subject, use some other information to
814 describe each commit.
<em><format
></em> can be any string accepted
815 by the
<code>--format
</code> option of
<em>git log
</em>, such as
<em>* [%h] %s
</em>.
816 (See the
"PRETTY FORMATS" section of
<a href=
"git-log.html">git-log(
1)
</a>.)
818 <div class=
"literalblock">
819 <div class=
"content">
820 <pre><code>Each pretty-printed commit will be rewrapped before it is shown.
</code></pre>
824 --date=
<format
>
828 Show dates formatted according to the given date string. (See
829 the
<code>--date
</code> option in the
"Commit Formatting" section of
830 <a href=
"git-log.html">git-log(
1)
</a>). Useful with
<code>--group=format:
<format
></code>.
838 Group commits based on
<code><type
></code>. If no
<code>--group
</code> option is
839 specified, the default is
<code>author
</code>.
<code><type
></code> is one of:
841 <div class=
"openblock">
842 <div class=
"content">
843 <div class=
"ulist"><ul>
846 <code>author
</code>, commits are grouped by author
851 <code>committer
</code>, commits are grouped by committer (the same as
<code>-c
</code>)
856 <code>trailer:
<field
></code>, the
<code><field
></code> is interpreted as a case-insensitive
857 commit message trailer (see
<a href=
"git-interpret-trailers.html">git-interpret-trailers(
1)
</a>). For
858 example, if your project uses
<code>Reviewed-by
</code> trailers, you might want
859 to see who has been reviewing with
860 <code>git shortlog -ns --group=trailer:reviewed-by
</code>.
865 <code>format:
<format
></code>, any string accepted by the
<code>--format
</code> option of
866 <em>git log
</em>. (See the
"PRETTY FORMATS" section of
867 <a href=
"git-log.html">git-log(
1)
</a>.)
869 <div class=
"paragraph"><p>Note that commits that do not include the trailer will not be counted.
870 Likewise, commits with multiple trailers (e.g., multiple signoffs) may
871 be counted more than once (but only once per unique trailer value in
872 that commit).
</p></div>
873 <div class=
"paragraph"><p>Shortlog will attempt to parse each trailer value as a
<code>name
<email
></code>
874 identity. If successful, the mailmap is applied and the email is omitted
875 unless the
<code>--email
</code> option is specified. If the value cannot be parsed
876 as an identity, it will be taken literally and completely.
</p></div>
880 <div class=
"paragraph"><p>If
<code>--group
</code> is specified multiple times, commits are counted under each
881 value (but again, only once per unique value in that commit). For
882 example,
<code>git shortlog --group=author --group=trailer:co-authored-by
</code>
883 counts both authors and co-authors.
</p></div>
893 This is an alias for
<code>--group=committer
</code>.
897 -w[
<width
>[,
<indent1
>[,
<indent2
>]]]
901 Linewrap the output by wrapping each line at
<code>width
</code>. The first
902 line of each entry is indented by
<code>indent1
</code> spaces, and the second
903 and subsequent lines are indented by
<code>indent2
</code> spaces.
<code>width
</code>,
904 <code>indent1
</code>, and
<code>indent2
</code> default to
76,
6 and
9 respectively.
906 <div class=
"paragraph"><p>If width is
<code>0</code> (zero) then indent the lines of the output without wrapping
910 <revision-range
>
914 Show only commits in the specified revision range. When no
915 <revision-range
> is specified, it defaults to
<code>HEAD
</code> (i.e. the
916 whole history leading to the current commit).
<code>origin..HEAD
</code>
917 specifies all the commits reachable from the current commit
918 (i.e.
<code>HEAD
</code>), but not from
<code>origin
</code>. For a complete list of
919 ways to spell
<revision-range
>, see the
"Specifying Ranges"
920 section of
<a href=
"gitrevisions.html">gitrevisions(
7)
</a>.
924 [--]
<path
>…
928 Consider only commits that are enough to explain how the files
929 that match the specified paths came to be.
931 <div class=
"paragraph"><p>Paths may need to be prefixed with
<code>--
</code> to separate them from
932 options or the revision range, when confusion arises.
</p></div>
936 <h3 id=
"_commit_limiting">Commit Limiting
</h3>
937 <div class=
"paragraph"><p>Besides specifying a range of commits that should be listed using the
938 special notations explained in the description, additional commit
939 limiting may be applied.
</p></div>
940 <div class=
"paragraph"><p>Using more options generally further limits the output (e.g.
941 <code>--since=
<date1
></code> limits to commits newer than
<code><date1
></code>, and using it
942 with
<code>--grep=
<pattern
></code> further limits to commits whose log message
943 has a line that matches
<code><pattern
></code>), unless otherwise noted.
</p></div>
944 <div class=
"paragraph"><p>Note that these are applied before commit
945 ordering and formatting options, such as
<code>--reverse
</code>.
</p></div>
946 <div class=
"dlist"><dl>
954 --max-count=
<number
>
958 Limit the number of commits to output.
962 --skip=
<number
>
966 Skip
<em>number
</em> commits before starting to show the commit output.
977 Show commits more recent than a specific date.
981 --since-as-filter=
<date
>
985 Show all commits more recent than a specific date. This visits
986 all commits in the range, rather than stopping at the first commit which
987 is older than a specific date.
994 --before=
<date
>
998 Show commits older than a specific date.
1001 <dt class=
"hdlist1">
1002 --author=
<pattern
>
1004 <dt class=
"hdlist1">
1005 --committer=
<pattern
>
1009 Limit the commits output to ones with author/committer
1010 header lines that match the specified pattern (regular
1011 expression). With more than one
<code>--author=
<pattern
></code>,
1012 commits whose author matches any of the given patterns are
1013 chosen (similarly for multiple
<code>--committer=
<pattern
></code>).
1016 <dt class=
"hdlist1">
1017 --grep-reflog=
<pattern
>
1021 Limit the commits output to ones with reflog entries that
1022 match the specified pattern (regular expression). With
1023 more than one
<code>--grep-reflog
</code>, commits whose reflog message
1024 matches any of the given patterns are chosen. It is an
1025 error to use this option unless
<code>--walk-reflogs
</code> is in use.
1028 <dt class=
"hdlist1">
1029 --grep=
<pattern
>
1033 Limit the commits output to ones with a log message that
1034 matches the specified pattern (regular expression). With
1035 more than one
<code>--grep=
<pattern
></code>, commits whose message
1036 matches any of the given patterns are chosen (but see
1037 <code>--all-match
</code>).
1039 <div class=
"paragraph"><p>When
<code>--notes
</code> is in effect, the message from the notes is
1040 matched as if it were part of the log message.
</p></div>
1042 <dt class=
"hdlist1">
1047 Limit the commits output to ones that match all given
<code>--grep
</code>,
1048 instead of ones that match at least one.
1051 <dt class=
"hdlist1">
1056 Limit the commits output to ones with a log message that do not
1057 match the pattern specified with
<code>--grep=
<pattern
></code>.
1060 <dt class=
"hdlist1">
1063 <dt class=
"hdlist1">
1064 --regexp-ignore-case
1068 Match the regular expression limiting patterns without regard to letter
1072 <dt class=
"hdlist1">
1077 Consider the limiting patterns to be basic regular expressions;
1078 this is the default.
1081 <dt class=
"hdlist1">
1084 <dt class=
"hdlist1">
1089 Consider the limiting patterns to be extended regular expressions
1090 instead of the default basic regular expressions.
1093 <dt class=
"hdlist1">
1096 <dt class=
"hdlist1">
1101 Consider the limiting patterns to be fixed strings (don
’t interpret
1102 pattern as a regular expression).
1105 <dt class=
"hdlist1">
1108 <dt class=
"hdlist1">
1113 Consider the limiting patterns to be Perl-compatible regular
1116 <div class=
"paragraph"><p>Support for these types of regular expressions is an optional
1117 compile-time dependency. If Git wasn
’t compiled with support for them
1118 providing this option will cause it to die.
</p></div>
1120 <dt class=
"hdlist1">
1125 Stop when a given path disappears from the tree.
1128 <dt class=
"hdlist1">
1133 Print only merge commits. This is exactly the same as
<code>--min-parents=
2</code>.
1136 <dt class=
"hdlist1">
1141 Do not print commits with more than one parent. This is
1142 exactly the same as
<code>--max-parents=
1</code>.
1145 <dt class=
"hdlist1">
1146 --min-parents=
<number
>
1148 <dt class=
"hdlist1">
1149 --max-parents=
<number
>
1151 <dt class=
"hdlist1">
1154 <dt class=
"hdlist1">
1159 Show only commits which have at least (or at most) that many parent
1160 commits. In particular,
<code>--max-parents=
1</code> is the same as
<code>--no-merges
</code>,
1161 <code>--min-parents=
2</code> is the same as
<code>--merges
</code>.
<code>--max-parents=
0</code>
1162 gives all root commits and
<code>--min-parents=
3</code> all octopus merges.
1164 <div class=
"paragraph"><p><code>--no-min-parents
</code> and
<code>--no-max-parents
</code> reset these limits (to no limit)
1165 again. Equivalent forms are
<code>--min-parents=
0</code> (any commit has
0 or more
1166 parents) and
<code>--max-parents=-
1</code> (negative numbers denote no upper limit).
</p></div>
1168 <dt class=
"hdlist1">
1173 When finding commits to include, follow only the first
1174 parent commit upon seeing a merge commit. This option
1175 can give a better overview when viewing the evolution of
1176 a particular topic branch, because merges into a topic
1177 branch tend to be only about adjusting to updated upstream
1178 from time to time, and this option allows you to ignore
1179 the individual commits brought in to your history by such
1183 <dt class=
"hdlist1">
1184 --exclude-first-parent-only
1188 When finding commits to exclude (with a
<em>^</em>), follow only
1189 the first parent commit upon seeing a merge commit.
1190 This can be used to find the set of changes in a topic branch
1191 from the point where it diverged from the remote branch, given
1192 that arbitrary merges can be valid topic branch changes.
1195 <dt class=
"hdlist1">
1200 Reverses the meaning of the
<em>^</em> prefix (or lack thereof)
1201 for all following revision specifiers, up to the next
<code>--not
</code>.
1202 When used on the command line before --stdin, the revisions passed
1203 through stdin will not be affected by it. Conversely, when passed
1204 via standard input, the revisions passed on the command line will
1205 not be affected by it.
1208 <dt class=
"hdlist1">
1213 Pretend as if all the refs in
<code>refs/
</code>, along with
<code>HEAD
</code>, are
1214 listed on the command line as
<em><commit
></em>.
1217 <dt class=
"hdlist1">
1218 --branches[=
<pattern
>]
1222 Pretend as if all the refs in
<code>refs/heads
</code> are listed
1223 on the command line as
<em><commit
></em>. If
<em><pattern
></em> is given, limit
1224 branches to ones matching given shell glob. If pattern lacks
<em>?
</em>,
1225 <em>*</em>, or
<em>[
</em>,
<em>/
*</em> at the end is implied.
1228 <dt class=
"hdlist1">
1229 --tags[=
<pattern
>]
1233 Pretend as if all the refs in
<code>refs/tags
</code> are listed
1234 on the command line as
<em><commit
></em>. If
<em><pattern
></em> is given, limit
1235 tags to ones matching given shell glob. If pattern lacks
<em>?
</em>,
<em>*</em>,
1236 or
<em>[
</em>,
<em>/
*</em> at the end is implied.
1239 <dt class=
"hdlist1">
1240 --remotes[=
<pattern
>]
1244 Pretend as if all the refs in
<code>refs/remotes
</code> are listed
1245 on the command line as
<em><commit
></em>. If
<em><pattern
></em> is given, limit
1246 remote-tracking branches to ones matching given shell glob.
1247 If pattern lacks
<em>?
</em>,
<em>*</em>, or
<em>[
</em>,
<em>/
*</em> at the end is implied.
1250 <dt class=
"hdlist1">
1251 --glob=
<glob-pattern
>
1255 Pretend as if all the refs matching shell glob
<em><glob-pattern
></em>
1256 are listed on the command line as
<em><commit
></em>. Leading
<em>refs/
</em>,
1257 is automatically prepended if missing. If pattern lacks
<em>?
</em>,
<em>*</em>,
1258 or
<em>[
</em>,
<em>/
*</em> at the end is implied.
1261 <dt class=
"hdlist1">
1262 --exclude=
<glob-pattern
>
1266 Do not include refs matching
<em><glob-pattern
></em> that the next
<code>--all
</code>,
1267 <code>--branches
</code>,
<code>--tags
</code>,
<code>--remotes
</code>, or
<code>--glob
</code> would otherwise
1268 consider. Repetitions of this option accumulate exclusion patterns
1269 up to the next
<code>--all
</code>,
<code>--branches
</code>,
<code>--tags
</code>,
<code>--remotes
</code>, or
1270 <code>--glob
</code> option (other options or arguments do not clear
1271 accumulated patterns).
1273 <div class=
"paragraph"><p>The patterns given should not begin with
<code>refs/heads
</code>,
<code>refs/tags
</code>, or
1274 <code>refs/remotes
</code> when applied to
<code>--branches
</code>,
<code>--tags
</code>, or
<code>--remotes
</code>,
1275 respectively, and they must begin with
<code>refs/
</code> when applied to
<code>--glob
</code>
1276 or
<code>--all
</code>. If a trailing
<em>/
*</em> is intended, it must be given
1277 explicitly.
</p></div>
1279 <dt class=
"hdlist1">
1280 --exclude-hidden=[fetch|receive|uploadpack]
1284 Do not include refs that would be hidden by
<code>git-fetch
</code>,
1285 <code>git-receive-pack
</code> or
<code>git-upload-pack
</code> by consulting the appropriate
1286 <code>fetch.hideRefs
</code>,
<code>receive.hideRefs
</code> or
<code>uploadpack.hideRefs
</code>
1287 configuration along with
<code>transfer.hideRefs
</code> (see
1288 <a href=
"git-config.html">git-config(
1)
</a>). This option affects the next pseudo-ref option
1289 <code>--all
</code> or
<code>--glob
</code> and is cleared after processing them.
1292 <dt class=
"hdlist1">
1297 Pretend as if all objects mentioned by reflogs are listed on the
1298 command line as
<code><commit
></code>.
1301 <dt class=
"hdlist1">
1306 Pretend as if all objects mentioned as ref tips of alternate
1307 repositories were listed on the command line. An alternate
1308 repository is any repository whose object directory is specified
1309 in
<code>objects/info/alternates
</code>. The set of included objects may
1310 be modified by
<code>core.alternateRefsCommand
</code>, etc. See
1311 <a href=
"git-config.html">git-config(
1)
</a>.
1314 <dt class=
"hdlist1">
1319 By default, all working trees will be examined by the
1320 following options when there are more than one (see
1321 <a href=
"git-worktree.html">git-worktree(
1)
</a>):
<code>--all
</code>,
<code>--reflog
</code> and
1322 <code>--indexed-objects
</code>.
1323 This option forces them to examine the current working tree
1327 <dt class=
"hdlist1">
1332 Upon seeing an invalid object name in the input, pretend as if
1333 the bad input was not given.
1336 <dt class=
"hdlist1">
1341 Pretend as if the bad bisection ref
<code>refs/bisect/bad
</code>
1342 was listed and as if it was followed by
<code>--not
</code> and the good
1343 bisection refs
<code>refs/bisect/good-*
</code> on the command
1347 <dt class=
"hdlist1">
1352 In addition to getting arguments from the command line, read
1353 them from standard input as well. This accepts commits and
1354 pseudo-options like
<code>--all
</code> and
<code>--glob=
</code>. When a
<code>--
</code> separator
1355 is seen, the following input is treated as paths and used to
1356 limit the result. Flags like
<code>--not
</code> which are read via standard input
1357 are only respected for arguments passed in the same way and will not
1358 influence any subsequent command line arguments.
1361 <dt class=
"hdlist1">
1366 Like
<code>--cherry-pick
</code> (see below) but mark equivalent commits
1367 with
<code>=
</code> rather than omitting them, and inequivalent ones with
<code>+
</code>.
1370 <dt class=
"hdlist1">
1375 Omit any commit that introduces the same change as
1376 another commit on the
“other side
” when the set of
1377 commits are limited with symmetric difference.
1379 <div class=
"paragraph"><p>For example, if you have two branches,
<code>A
</code> and
<code>B
</code>, a usual way
1380 to list all commits on only one side of them is with
1381 <code>--left-right
</code> (see the example below in the description of
1382 the
<code>--left-right
</code> option). However, it shows the commits that were
1383 cherry-picked from the other branch (for example,
“3rd on b
” may be
1384 cherry-picked from branch A). With this option, such pairs of commits are
1385 excluded from the output.
</p></div>
1387 <dt class=
"hdlist1">
1390 <dt class=
"hdlist1">
1395 List only commits on the respective side of a symmetric difference,
1396 i.e. only those which would be marked
<code><</code> resp.
<code>></code> by
1397 <code>--left-right
</code>.
1399 <div class=
"paragraph"><p>For example,
<code>--cherry-pick --right-only A...B
</code> omits those
1400 commits from
<code>B
</code> which are in
<code>A
</code> or are patch-equivalent to a commit in
1401 <code>A
</code>. In other words, this lists the
<code>+
</code> commits from
<code>git cherry A B
</code>.
1402 More precisely,
<code>--cherry-pick --right-only --no-merges
</code> gives the exact
1405 <dt class=
"hdlist1">
1410 A synonym for
<code>--right-only --cherry-mark --no-merges
</code>; useful to
1411 limit the output to the commits on our side and mark those that
1412 have been applied to the other side of a forked history with
1413 <code>git log --cherry upstream...mybranch
</code>, similar to
1414 <code>git cherry upstream mybranch
</code>.
1417 <dt class=
"hdlist1">
1420 <dt class=
"hdlist1">
1425 Instead of walking the commit ancestry chain, walk
1426 reflog entries from the most recent one to older ones.
1427 When this option is used you cannot specify commits to
1428 exclude (that is,
<em>^commit
</em>,
<em>commit1..commit2
</em>,
1429 and
<em>commit1...commit2
</em> notations cannot be used).
1431 <div class=
"paragraph"><p>With
<code>--pretty
</code> format other than
<code>oneline
</code> and
<code>reference
</code> (for obvious reasons),
1432 this causes the output to have two extra lines of information
1433 taken from the reflog. The reflog designator in the output may be shown
1434 as
<code>ref@{
<Nth
>}
</code> (where
<em><Nth
></em> is the reverse-chronological index in the
1435 reflog) or as
<code>ref@{
<timestamp
>}
</code> (with the
<em><timestamp
></em> for that entry),
1436 depending on a few rules:
</p></div>
1437 <div class=
"openblock">
1438 <div class=
"content">
1439 <div class=
"olist arabic"><ol class=
"arabic">
1442 If the starting point is specified as
<code>ref@{
<Nth
>}
</code>, show the index
1448 If the starting point was specified as
<code>ref@{now}
</code>, show the
1454 If neither was used, but
<code>--date
</code> was given on the command line, show
1455 the timestamp in the format requested by
<code>--date
</code>.
1460 Otherwise, show the index format.
1465 <div class=
"paragraph"><p>Under
<code>--pretty=oneline
</code>, the commit message is
1466 prefixed with this information on the same line.
1467 This option cannot be combined with
<code>--reverse
</code>.
1468 See also
<a href=
"git-reflog.html">git-reflog(
1)
</a>.
</p></div>
1469 <div class=
"paragraph"><p>Under
<code>--pretty=reference
</code>, this information will not be shown at all.
</p></div>
1471 <dt class=
"hdlist1">
1476 Show commits touching conflicted paths in the range
<code>HEAD...
<other
></code>,
1477 where
<code><other
></code> is the first existing pseudoref in
<code>MERGE_HEAD
</code>,
1478 <code>CHERRY_PICK_HEAD
</code>,
<code>REVERT_HEAD
</code> or
<code>REBASE_HEAD
</code>. Only works
1479 when the index has unmerged entries. This option can be used to show
1480 relevant commits when resolving conflicts from a
3-way merge.
1483 <dt class=
"hdlist1">
1488 Output excluded boundary commits. Boundary commits are
1489 prefixed with
<code>-
</code>.
1495 <h3 id=
"_history_simplification">History Simplification
</h3>
1496 <div class=
"paragraph"><p>Sometimes you are only interested in parts of the history, for example the
1497 commits modifying a particular
<path
>. But there are two parts of
1498 <em>History Simplification
</em>, one part is selecting the commits and the other
1499 is how to do it, as there are various strategies to simplify the history.
</p></div>
1500 <div class=
"paragraph"><p>The following options select the commits to be shown:
</p></div>
1501 <div class=
"dlist"><dl>
1502 <dt class=
"hdlist1">
1507 Commits modifying the given
<paths
> are selected.
1510 <dt class=
"hdlist1">
1511 --simplify-by-decoration
1515 Commits that are referred by some branch or tag are selected.
1519 <div class=
"paragraph"><p>Note that extra commits can be shown to give a meaningful history.
</p></div>
1520 <div class=
"paragraph"><p>The following options affect the way the simplification is performed:
</p></div>
1521 <div class=
"dlist"><dl>
1522 <dt class=
"hdlist1">
1527 Simplifies the history to the simplest history explaining the
1528 final state of the tree. Simplest because it prunes some side
1529 branches if the end result is the same (i.e. merging branches
1530 with the same content)
1533 <dt class=
"hdlist1">
1538 Include all commits from the default mode, but also any merge
1539 commits that are not TREESAME to the first parent but are
1540 TREESAME to a later parent. This mode is helpful for showing
1541 the merge commits that
"first introduced" a change to a branch.
1544 <dt class=
"hdlist1">
1549 Same as the default mode, but does not prune some history.
1552 <dt class=
"hdlist1">
1557 Only the selected commits are shown, plus some to have a
1561 <dt class=
"hdlist1">
1566 All commits in the simplified history are shown.
1569 <dt class=
"hdlist1">
1574 Additional option to
<code>--full-history
</code> to remove some needless
1575 merges from the resulting history, as there are no selected
1576 commits contributing to this merge.
1579 <dt class=
"hdlist1">
1580 --ancestry-path[=
<commit
>]
1584 When given a range of commits to display (e.g.
<em>commit1..commit2
</em>
1585 or
<em>commit2
^commit1
</em>), only display commits in that range
1586 that are ancestors of
<commit
>, descendants of
<commit
>, or
1587 <commit
> itself. If no commit is specified, use
<em>commit1
</em> (the
1588 excluded part of the range) as
<commit
>. Can be passed multiple
1589 times; if so, a commit is included if it is any of the commits
1590 given or if it is an ancestor or descendant of one of them.
1594 <div class=
"paragraph"><p>A more detailed explanation follows.
</p></div>
1595 <div class=
"paragraph"><p>Suppose you specified
<code>foo
</code> as the
<paths
>. We shall call commits
1596 that modify
<code>foo
</code> !TREESAME, and the rest TREESAME. (In a diff
1597 filtered for
<code>foo
</code>, they look different and equal, respectively.)
</p></div>
1598 <div class=
"paragraph"><p>In the following, we will always refer to the same example history to
1599 illustrate the differences between simplification settings. We assume
1600 that you are filtering for a file
<code>foo
</code> in this commit graph:
</p></div>
1601 <div class=
"listingblock">
1602 <div class=
"content">
1603 <pre><code> .-A---M---N---O---P---Q
1607 `-------------' X
</code></pre>
1609 <div class=
"paragraph"><p>The horizontal line of history A---Q is taken to be the first parent of
1610 each merge. The commits are:
</p></div>
1611 <div class=
"ulist"><ul>
1614 <code>I
</code> is the initial commit, in which
<code>foo
</code> exists with contents
1615 “asdf
”, and a file
<code>quux
</code> exists with contents
“quux
”. Initial
1616 commits are compared to an empty tree, so
<code>I
</code> is !TREESAME.
1621 In
<code>A
</code>,
<code>foo
</code> contains just
“foo
”.
1626 <code>B
</code> contains the same change as
<code>A
</code>. Its merge
<code>M
</code> is trivial and
1627 hence TREESAME to all parents.
1632 <code>C
</code> does not change
<code>foo
</code>, but its merge
<code>N
</code> changes it to
“foobar
”,
1633 so it is not TREESAME to any parent.
1638 <code>D
</code> sets
<code>foo
</code> to
“baz
”. Its merge
<code>O
</code> combines the strings from
1639 <code>N
</code> and
<code>D
</code> to
“foobarbaz
”; i.e., it is not TREESAME to any parent.
1644 <code>E
</code> changes
<code>quux
</code> to
“xyzzy
”, and its merge
<code>P
</code> combines the
1645 strings to
“quux xyzzy
”.
<code>P
</code> is TREESAME to
<code>O
</code>, but not to
<code>E
</code>.
1650 <code>X
</code> is an independent root commit that added a new file
<code>side
</code>, and
<code>Y
</code>
1651 modified it.
<code>Y
</code> is TREESAME to
<code>X
</code>. Its merge
<code>Q
</code> added
<code>side
</code> to
<code>P
</code>, and
1652 <code>Q
</code> is TREESAME to
<code>P
</code>, but not to
<code>Y
</code>.
1656 <div class=
"paragraph"><p><code>rev-list
</code> walks backwards through history, including or excluding
1657 commits based on whether
<code>--full-history
</code> and/or parent rewriting
1658 (via
<code>--parents
</code> or
<code>--children
</code>) are used. The following settings
1659 are available.
</p></div>
1660 <div class=
"dlist"><dl>
1661 <dt class=
"hdlist1">
1666 Commits are included if they are not TREESAME to any parent
1667 (though this can be changed, see
<code>--sparse
</code> below). If the
1668 commit was a merge, and it was TREESAME to one parent, follow
1669 only that parent. (Even if there are several TREESAME
1670 parents, follow only one of them.) Otherwise, follow all
1673 <div class=
"paragraph"><p>This results in:
</p></div>
1674 <div class=
"listingblock">
1675 <div class=
"content">
1676 <pre><code> .-A---N---O
1678 I---------D
</code></pre>
1680 <div class=
"paragraph"><p>Note how the rule to only follow the TREESAME parent, if one is
1681 available, removed
<code>B
</code> from consideration entirely.
<code>C
</code> was
1682 considered via
<code>N
</code>, but is TREESAME. Root commits are compared to an
1683 empty tree, so
<code>I
</code> is !TREESAME.
</p></div>
1684 <div class=
"paragraph"><p>Parent/child relations are only visible with
<code>--parents
</code>, but that does
1685 not affect the commits selected in default mode, so we have shown the
1686 parent lines.
</p></div>
1688 <dt class=
"hdlist1">
1689 --full-history without parent rewriting
1693 This mode differs from the default in one point: always follow
1694 all parents of a merge, even if it is TREESAME to one of them.
1695 Even if more than one side of the merge has commits that are
1696 included, this does not imply that the merge itself is! In
1699 <div class=
"listingblock">
1700 <div class=
"content">
1701 <pre><code> I A B N D O P Q
</code></pre>
1703 <div class=
"paragraph"><p><code>M
</code> was excluded because it is TREESAME to both parents.
<code>E
</code>,
1704 <code>C
</code> and
<code>B
</code> were all walked, but only
<code>B
</code> was !TREESAME, so the others
1705 do not appear.
</p></div>
1706 <div class=
"paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1707 about the parent/child relationships between the commits, so we show
1708 them disconnected.
</p></div>
1710 <dt class=
"hdlist1">
1711 --full-history with parent rewriting
1715 Ordinary commits are only included if they are !TREESAME
1716 (though this can be changed, see
<code>--sparse
</code> below).
1718 <div class=
"paragraph"><p>Merges are always included. However, their parent list is rewritten:
1719 Along each parent, prune away commits that are not included
1720 themselves. This results in
</p></div>
1721 <div class=
"listingblock">
1722 <div class=
"content">
1723 <pre><code> .-A---M---N---O---P---Q
1727 `-------------'
</code></pre>
1729 <div class=
"paragraph"><p>Compare to
<code>--full-history
</code> without rewriting above. Note that
<code>E
</code>
1730 was pruned away because it is TREESAME, but the parent list of P was
1731 rewritten to contain
<code>E
</code>'s parent
<code>I
</code>. The same happened for
<code>C
</code> and
1732 <code>N
</code>, and
<code>X
</code>,
<code>Y
</code> and
<code>Q
</code>.
</p></div>
1735 <div class=
"paragraph"><p>In addition to the above settings, you can change whether TREESAME
1736 affects inclusion:
</p></div>
1737 <div class=
"dlist"><dl>
1738 <dt class=
"hdlist1">
1743 Commits that are walked are included if they are not TREESAME
1747 <dt class=
"hdlist1">
1752 All commits that are walked are included.
1754 <div class=
"paragraph"><p>Note that without
<code>--full-history
</code>, this still simplifies merges: if
1755 one of the parents is TREESAME, we follow only that one, so the other
1756 sides of the merge are never walked.
</p></div>
1758 <dt class=
"hdlist1">
1763 First, build a history graph in the same way that
1764 <code>--full-history
</code> with parent rewriting does (see above).
1766 <div class=
"paragraph"><p>Then simplify each commit
<code>C
</code> to its replacement
<code>C'
</code> in the final
1767 history according to the following rules:
</p></div>
1768 <div class=
"openblock">
1769 <div class=
"content">
1770 <div class=
"ulist"><ul>
1773 Set
<code>C'
</code> to
<code>C
</code>.
1778 Replace each parent
<code>P
</code> of
<code>C'
</code> with its simplification
<code>P'
</code>. In
1779 the process, drop parents that are ancestors of other parents or that are
1780 root commits TREESAME to an empty tree, and remove duplicates, but take care
1781 to never drop all parents that we are TREESAME to.
1786 If after this parent rewriting,
<code>C'
</code> is a root or merge commit (has
1787 zero or
>1 parents), a boundary commit, or !TREESAME, it remains.
1788 Otherwise, it is replaced with its only parent.
1793 <div class=
"paragraph"><p>The effect of this is best shown by way of comparing to
1794 <code>--full-history
</code> with parent rewriting. The example turns into:
</p></div>
1795 <div class=
"listingblock">
1796 <div class=
"content">
1797 <pre><code> .-A---M---N---O
1801 `---------'
</code></pre>
1803 <div class=
"paragraph"><p>Note the major differences in
<code>N
</code>,
<code>P
</code>, and
<code>Q
</code> over
<code>--full-history
</code>:
</p></div>
1804 <div class=
"openblock">
1805 <div class=
"content">
1806 <div class=
"ulist"><ul>
1809 <code>N
</code>'s parent list had
<code>I
</code> removed, because it is an ancestor of the
1810 other parent
<code>M
</code>. Still,
<code>N
</code> remained because it is !TREESAME.
1815 <code>P
</code>'s parent list similarly had
<code>I
</code> removed.
<code>P
</code> was then
1816 removed completely, because it had one parent and is TREESAME.
1821 <code>Q
</code>'s parent list had
<code>Y
</code> simplified to
<code>X
</code>.
<code>X
</code> was then removed, because it
1822 was a TREESAME root.
<code>Q
</code> was then removed completely, because it had one
1823 parent and is TREESAME.
1830 <div class=
"paragraph"><p>There is another simplification mode available:
</p></div>
1831 <div class=
"dlist"><dl>
1832 <dt class=
"hdlist1">
1833 --ancestry-path[=
<commit
>]
1837 Limit the displayed commits to those which are an ancestor of
1838 <commit
>, or which are a descendant of
<commit
>, or are
<commit
>
1841 <div class=
"paragraph"><p>As an example use case, consider the following commit history:
</p></div>
1842 <div class=
"listingblock">
1843 <div class=
"content">
1844 <pre><code> D---E-------F
1846 B---C---G---H---I---J
1848 A-------K---------------L--M
</code></pre>
1850 <div class=
"paragraph"><p>A regular
<em>D..M
</em> computes the set of commits that are ancestors of
<code>M
</code>,
1851 but excludes the ones that are ancestors of
<code>D
</code>. This is useful to see
1852 what happened to the history leading to
<code>M
</code> since
<code>D
</code>, in the sense
1853 that
“what does
<code>M
</code> have that did not exist in
<code>D
</code>”. The result in this
1854 example would be all the commits, except
<code>A
</code> and
<code>B
</code> (and
<code>D
</code> itself,
1855 of course).
</p></div>
1856 <div class=
"paragraph"><p>When we want to find out what commits in
<code>M
</code> are contaminated with the
1857 bug introduced by
<code>D
</code> and need fixing, however, we might want to view
1858 only the subset of
<em>D..M
</em> that are actually descendants of
<code>D
</code>, i.e.
1859 excluding
<code>C
</code> and
<code>K
</code>. This is exactly what the
<code>--ancestry-path
</code>
1860 option does. Applied to the
<em>D..M
</em> range, it results in:
</p></div>
1861 <div class=
"listingblock">
1862 <div class=
"content">
1863 <pre><code> E-------F
1869 <div class=
"paragraph"><p>We can also use
<code>--ancestry-path=D
</code> instead of
<code>--ancestry-path
</code> which
1870 means the same thing when applied to the
<em>D..M
</em> range but is just more
1872 <div class=
"paragraph"><p>If we instead are interested in a given topic within this range, and all
1873 commits affected by that topic, we may only want to view the subset of
1874 <code>D..M
</code> which contain that topic in their ancestry path. So, using
1875 <code>--ancestry-path=H D..M
</code> for example would result in:
</p></div>
1876 <div class=
"listingblock">
1877 <div class=
"content">
1884 <div class=
"paragraph"><p>Whereas
<code>--ancestry-path=K D..M
</code> would result in
</p></div>
1885 <div class=
"listingblock">
1886 <div class=
"content">
1887 <pre><code> K---------------L--M
</code></pre>
1891 <div class=
"paragraph"><p>Before discussing another option,
<code>--show-pulls
</code>, we need to
1892 create a new example history.
</p></div>
1893 <div class=
"paragraph"><p>A common problem users face when looking at simplified history is that a
1894 commit they know changed a file somehow does not appear in the file
’s
1895 simplified history. Let
’s demonstrate a new example and show how options
1896 such as
<code>--full-history
</code> and
<code>--simplify-merges
</code> works in that case:
</p></div>
1897 <div class=
"listingblock">
1898 <div class=
"content">
1899 <pre><code> .-A---M-----C--N---O---P
1904 `---X--' `---Y--'
</code></pre>
1906 <div class=
"paragraph"><p>For this example, suppose
<code>I
</code> created
<code>file.txt
</code> which was modified by
1907 <code>A
</code>,
<code>B
</code>, and
<code>X
</code> in different ways. The single-parent commits
<code>C
</code>,
<code>Z
</code>,
1908 and
<code>Y
</code> do not change
<code>file.txt
</code>. The merge commit
<code>M
</code> was created by
1909 resolving the merge conflict to include both changes from
<code>A
</code> and
<code>B
</code>
1910 and hence is not TREESAME to either. The merge commit
<code>R
</code>, however, was
1911 created by ignoring the contents of
<code>file.txt
</code> at
<code>M
</code> and taking only
1912 the contents of
<code>file.txt
</code> at
<code>X
</code>. Hence,
<code>R
</code> is TREESAME to
<code>X
</code> but not
1913 <code>M
</code>. Finally, the natural merge resolution to create
<code>N
</code> is to take the
1914 contents of
<code>file.txt
</code> at
<code>R
</code>, so
<code>N
</code> is TREESAME to
<code>R
</code> but not
<code>C
</code>.
1915 The merge commits
<code>O
</code> and
<code>P
</code> are TREESAME to their first parents, but
1916 not to their second parents,
<code>Z
</code> and
<code>Y
</code> respectively.
</p></div>
1917 <div class=
"paragraph"><p>When using the default mode,
<code>N
</code> and
<code>R
</code> both have a TREESAME parent, so
1918 those edges are walked and the others are ignored. The resulting history
1920 <div class=
"listingblock">
1921 <div class=
"content">
1922 <pre><code> I---X
</code></pre>
1924 <div class=
"paragraph"><p>When using
<code>--full-history
</code>, Git walks every edge. This will discover
1925 the commits
<code>A
</code> and
<code>B
</code> and the merge
<code>M
</code>, but also will reveal the
1926 merge commits
<code>O
</code> and
<code>P
</code>. With parent rewriting, the resulting graph is:
</p></div>
1927 <div class=
"listingblock">
1928 <div class=
"content">
1929 <pre><code> .-A---M--------N---O---P
1934 `---X--' `------'
</code></pre>
1936 <div class=
"paragraph"><p>Here, the merge commits
<code>O
</code> and
<code>P
</code> contribute extra noise, as they did
1937 not actually contribute a change to
<code>file.txt
</code>. They only merged a topic
1938 that was based on an older version of
<code>file.txt
</code>. This is a common
1939 issue in repositories using a workflow where many contributors work in
1940 parallel and merge their topic branches along a single trunk: many
1941 unrelated merges appear in the
<code>--full-history
</code> results.
</p></div>
1942 <div class=
"paragraph"><p>When using the
<code>--simplify-merges
</code> option, the commits
<code>O
</code> and
<code>P
</code>
1943 disappear from the results. This is because the rewritten second parents
1944 of
<code>O
</code> and
<code>P
</code> are reachable from their first parents. Those edges are
1945 removed and then the commits look like single-parent commits that are
1946 TREESAME to their parent. This also happens to the commit
<code>N
</code>, resulting
1947 in a history view as follows:
</p></div>
1948 <div class=
"listingblock">
1949 <div class=
"content">
1950 <pre><code> .-A---M--.
1955 `---X--'
</code></pre>
1957 <div class=
"paragraph"><p>In this view, we see all of the important single-parent changes from
1958 <code>A
</code>,
<code>B
</code>, and
<code>X
</code>. We also see the carefully-resolved merge
<code>M
</code> and the
1959 not-so-carefully-resolved merge
<code>R
</code>. This is usually enough information
1960 to determine why the commits
<code>A
</code> and
<code>B
</code> "disappeared" from history in
1961 the default view. However, there are a few issues with this approach.
</p></div>
1962 <div class=
"paragraph"><p>The first issue is performance. Unlike any previous option, the
1963 <code>--simplify-merges
</code> option requires walking the entire commit history
1964 before returning a single result. This can make the option difficult to
1965 use for very large repositories.
</p></div>
1966 <div class=
"paragraph"><p>The second issue is one of auditing. When many contributors are working
1967 on the same repository, it is important which merge commits introduced
1968 a change into an important branch. The problematic merge
<code>R
</code> above is
1969 not likely to be the merge commit that was used to merge into an
1970 important branch. Instead, the merge
<code>N
</code> was used to merge
<code>R
</code> and
<code>X
</code>
1971 into the important branch. This commit may have information about why
1972 the change
<code>X
</code> came to override the changes from
<code>A
</code> and
<code>B
</code> in its
1973 commit message.
</p></div>
1974 <div class=
"dlist"><dl>
1975 <dt class=
"hdlist1">
1980 In addition to the commits shown in the default history, show
1981 each merge commit that is not TREESAME to its first parent but
1982 is TREESAME to a later parent.
1984 <div class=
"paragraph"><p>When a merge commit is included by
<code>--show-pulls
</code>, the merge is
1985 treated as if it
"pulled" the change from another branch. When using
1986 <code>--show-pulls
</code> on this example (and no other options) the resulting
1988 <div class=
"listingblock">
1989 <div class=
"content">
1990 <pre><code> I---X---R---N
</code></pre>
1992 <div class=
"paragraph"><p>Here, the merge commits
<code>R
</code> and
<code>N
</code> are included because they pulled
1993 the commits
<code>X
</code> and
<code>R
</code> into the base branch, respectively. These
1994 merges are the reason the commits
<code>A
</code> and
<code>B
</code> do not appear in the
1995 default history.
</p></div>
1996 <div class=
"paragraph"><p>When
<code>--show-pulls
</code> is paired with
<code>--simplify-merges
</code>, the
1997 graph includes all of the necessary information:
</p></div>
1998 <div class=
"listingblock">
1999 <div class=
"content">
2000 <pre><code> .-A---M--. N
2005 `---X--'
</code></pre>
2007 <div class=
"paragraph"><p>Notice that since
<code>M
</code> is reachable from
<code>R
</code>, the edge from
<code>N
</code> to
<code>M
</code>
2008 was simplified away. However,
<code>N
</code> still appears in the history as an
2009 important commit because it
"pulled" the change
<code>R
</code> into the main
2013 <div class=
"paragraph"><p>The
<code>--simplify-by-decoration
</code> option allows you to view only the
2014 big picture of the topology of the history, by omitting commits
2015 that are not referenced by tags. Commits are marked as !TREESAME
2016 (in other words, kept after history simplification rules described
2017 above) if (
1) they are referenced by tags, or (
2) they change the
2018 contents of the paths given on the command line. All other
2019 commits are marked as TREESAME (subject to be simplified away).
</p></div>
2024 <h2 id=
"_mapping_authors">MAPPING AUTHORS
</h2>
2025 <div class=
"sectionbody">
2026 <div class=
"paragraph"><p>See
<a href=
"gitmailmap.html">gitmailmap(
5)
</a>.
</p></div>
2027 <div class=
"paragraph"><p>Note that if
<code>git shortlog
</code> is run outside of a repository (to process
2028 log contents on standard input), it will look for a
<code>.mailmap
</code> file in
2029 the current directory.
</p></div>
2033 <h2 id=
"_git">GIT
</h2>
2034 <div class=
"sectionbody">
2035 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
2039 <div id=
"footnotes"><hr /></div>
2041 <div id=
"footer-text">
2043 2022-
11-
04 21:
49:
36 PDT