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>gitrevisions(
7)
</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 gitrevisions(
7) Manual Page
741 <div class=
"sectionbody">
743 Specifying revisions and ranges for Git
749 <h2 id=
"_synopsis">SYNOPSIS
</h2>
750 <div class=
"sectionbody">
751 <div class=
"paragraph"><p>gitrevisions
</p></div>
755 <h2 id=
"_description">DESCRIPTION
</h2>
756 <div class=
"sectionbody">
757 <div class=
"paragraph"><p>Many Git commands take revision parameters as arguments. Depending on
758 the command, they denote a specific commit or, for commands which
759 walk the revision graph (such as
<a href=
"git-log.html">git-log(
1)
</a>), all commits which are
760 reachable from that commit. For commands that walk the revision graph one can
761 also specify a range of revisions explicitly.
</p></div>
762 <div class=
"paragraph"><p>In addition, some Git commands (such as
<a href=
"git-show.html">git-show(
1)
</a> and
763 <a href=
"git-push.html">git-push(
1)
</a>) can also take revision parameters which denote
764 other objects than commits, e.g. blobs (
"files") or trees
765 (
"directories of files").
</p></div>
769 <h2 id=
"_specifying_revisions">SPECIFYING REVISIONS
</h2>
770 <div class=
"sectionbody">
771 <div class=
"paragraph"><p>A revision parameter
<em><rev
></em> typically, but not necessarily, names a
772 commit object. It uses what is called an
<em>extended SHA-
1</em>
773 syntax. Here are various ways to spell object names. The
774 ones listed near the end of this list name trees and
775 blobs contained in a commit.
</p></div>
776 <div class=
"admonitionblock">
779 <div class=
"title">Note
</div>
781 <td class=
"content">This document shows the
"raw" syntax as seen by git. The shell
782 and other UIs might require additional quoting to protect special
783 characters and to avoid word splitting.
</td>
786 <div class=
"dlist"><dl>
788 <em><sha1
></em>, e.g.
<em>dae86e1950b1277e545cee180551750029cfe735
</em>,
<em>dae86e
</em>
792 The full SHA-
1 object name (
40-byte hexadecimal string), or
793 a leading substring that is unique within the repository.
794 E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
795 name the same commit object if there is no other object in
796 your repository whose object name starts with dae86e.
800 <em><describeOutput
></em>, e.g.
<em>v1.7
.4.2-
679-g3bee7fb
</em>
804 Output from
<code>git describe
</code>; i.e. a closest tag, optionally
805 followed by a dash and a number of commits, followed by a dash, a
806 <em>g
</em>, and an abbreviated object name.
810 <em><refname
></em>, e.g.
<em>master
</em>,
<em>heads/master
</em>,
<em>refs/heads/master
</em>
814 A symbolic ref name. E.g.
<em>master
</em> typically means the commit
815 object referenced by
<em>refs/heads/master
</em>. If you
816 happen to have both
<em>heads/master
</em> and
<em>tags/master
</em>, you can
817 explicitly say
<em>heads/master
</em> to tell Git which one you mean.
818 When ambiguous, a
<em><refname
></em> is disambiguated by taking the
819 first match in the following rules:
821 <div class=
"olist arabic"><ol class=
"arabic">
824 If
<em>$GIT_DIR/
<refname
></em> exists, that is what you mean (this is usually
825 useful only for
<code>HEAD
</code>,
<code>FETCH_HEAD
</code>,
<code>ORIG_HEAD
</code>,
<code>MERGE_HEAD
</code>
826 and
<code>CHERRY_PICK_HEAD
</code>);
831 otherwise,
<em>refs/
<refname
></em> if it exists;
836 otherwise,
<em>refs/tags/
<refname
></em> if it exists;
841 otherwise,
<em>refs/heads/
<refname
></em> if it exists;
846 otherwise,
<em>refs/remotes/
<refname
></em> if it exists;
851 otherwise,
<em>refs/remotes/
<refname
>/HEAD
</em> if it exists.
853 <div class=
"paragraph"><p><code>HEAD
</code> names the commit on which you based the changes in the working tree.
854 <code>FETCH_HEAD
</code> records the branch which you fetched from a remote repository
855 with your last
<code>git fetch
</code> invocation.
856 <code>ORIG_HEAD
</code> is created by commands that move your
<code>HEAD
</code> in a drastic
857 way (
<code>git am
</code>,
<code>git merge
</code>,
<code>git rebase
</code>,
<code>git reset
</code>),
858 to record the position of the
<code>HEAD
</code> before their operation, so that
859 you can easily change the tip of the branch back to the state before you ran
861 <code>MERGE_HEAD
</code> records the commit(s) which you are merging into your branch
862 when you run
<code>git merge
</code>.
863 <code>CHERRY_PICK_HEAD
</code> records the commit which you are cherry-picking
864 when you run
<code>git cherry-pick
</code>.
</p></div>
865 <div class=
"paragraph"><p>Note that any of the
<em>refs/*
</em> cases above may come either from
866 the
<code>$GIT_DIR/refs
</code> directory or from the
<code>$GIT_DIR/packed-refs
</code> file.
867 While the ref name encoding is unspecified, UTF-
8 is preferred as
868 some output processing may assume ref names in UTF-
8.
</p></div>
877 <em>@
</em> alone is a shortcut for
<code>HEAD
</code>.
881 <em>[
<refname
>]@{
<date
>}
</em>, e.g.
<em>master@{yesterday}
</em>,
<em>HEAD@{
5 minutes ago}
</em>
885 A ref followed by the suffix
<em>@
</em> with a date specification
887 pair (e.g.
<em>{yesterday}
</em>,
<em>{
1 month
2 weeks
3 days
1 hour
1
888 second ago}
</em> or
<em>{
1979-
02-
26 18:
30:
00}
</em>) specifies the value
889 of the ref at a prior point in time. This suffix may only be
890 used immediately following a ref name and the ref must have an
891 existing log (
<em>$GIT_DIR/logs/
<ref
></em>). Note that this looks up the state
892 of your
<strong>local
</strong> ref at a given time; e.g., what was in your local
893 <em>master
</em> branch last week. If you want to look at commits made during
894 certain times, see
<code>--since
</code> and
<code>--until
</code>.
898 <em><refname
>@{
<n
>}
</em>, e.g.
<em>master@{
1}
</em>
902 A ref followed by the suffix
<em>@
</em> with an ordinal specification
903 enclosed in a brace pair (e.g.
<em>{
1}
</em>,
<em>{
15}
</em>) specifies
904 the n-th prior value of that ref. For example
<em>master@{
1}
</em>
905 is the immediate prior value of
<em>master
</em> while
<em>master@{
5}
</em>
906 is the
5th prior value of
<em>master
</em>. This suffix may only be used
907 immediately following a ref name and the ref must have an existing
908 log (
<em>$GIT_DIR/logs/
<refname
></em>).
912 <em>@{
<n
>}
</em>, e.g.
<em>@{
1}
</em>
916 You can use the
<em>@
</em> construct with an empty ref part to get at a
917 reflog entry of the current branch. For example, if you are on
918 branch
<em>blabla
</em> then
<em>@{
1}
</em> means the same as
<em>blabla@{
1}
</em>.
922 <em>@{-
<n
>}
</em>, e.g.
<em>@{-
1}
</em>
926 The construct
<em>@{-
<n
>}
</em> means the
<n
>th branch/commit checked out
927 before the current one.
931 <em>[
<branchname
>]@{upstream}
</em>, e.g.
<em>master@{upstream}
</em>,
<em>@{u}
</em>
935 A branch B may be set up to build on top of a branch X (configured with
936 <code>branch.
<name
>.merge
</code>) at a remote R (configured with
937 the branch X taken from remote R, typically found at
<code>refs/remotes/R/X
</code>.
941 <em>[
<branchname
>]@{push}
</em>, e.g.
<em>master@{push}
</em>,
<em>@{push}
</em>
945 The suffix
<em>@{push}
</em> reports the branch
"where we would push to" if
946 <code>git push
</code> were run while
<code>branchname
</code> was checked out (or the current
947 <code>HEAD
</code> if no branchname is specified). Like for
<em>@{upstream}
</em>, we report
948 the remote-tracking branch that corresponds to that branch at the remote.
950 <div class=
"paragraph"><p>Here
’s an example to make it more clear:
</p></div>
951 <div class=
"listingblock">
952 <div class=
"content">
953 <pre><code>$ git config push.default current
954 $ git config remote.pushdefault myfork
955 $ git switch -c mybranch origin/master
957 $ git rev-parse --symbolic-full-name @{upstream}
958 refs/remotes/origin/master
960 $ git rev-parse --symbolic-full-name @{push}
961 refs/remotes/myfork/mybranch
</code></pre>
963 <div class=
"paragraph"><p>Note in the example that we set up a triangular workflow, where we pull
964 from one location and push to another. In a non-triangular workflow,
965 <em>@{push}
</em> is the same as
<em>@{upstream}
</em>, and there is no need for it.
</p></div>
966 <div class=
"paragraph"><p>This suffix is also accepted when spelled in uppercase, and means the same
967 thing no matter the case.
</p></div>
970 <em><rev
>^[
<n
>]
</em>, e.g.
<em>HEAD
^, v1.5
.1^0</em>
974 A suffix
<em>^</em> to a revision parameter means the first parent of
975 that commit object.
<em>^<n
></em> means the
<n
>th parent (i.e.
976 <em><rev
>^</em>
977 is equivalent to
<em><rev
>^1</em>). As a special rule,
978 <em><rev
>^0</em> means the commit itself and is used when
<em><rev
></em> is the
979 object name of a tag object that refers to a commit object.
983 <em><rev
>~[
<n
>]
</em>, e.g.
<em>HEAD
~, master
~3</em>
987 A suffix
<em>~</em> to a revision parameter means the first parent of
989 A suffix
<em>~<n
></em> to a revision parameter means the commit
990 object that is the
<n
>th generation ancestor of the named
991 commit object, following only the first parents. I.e.
<em><rev
>~3</em> is
992 equivalent to
<em><rev
>^^^</em> which is equivalent to
993 <em><rev
>^1^1^1</em>. See below for an illustration of
994 the usage of this form.
998 <em><rev
>^{
<type
>}
</em>, e.g.
<em>v0.99
.8^{commit}
</em>
1002 A suffix
<em>^</em> followed by an object type name enclosed in
1003 brace pair means dereference the object at
<em><rev
></em> recursively until
1004 an object of type
<em><type
></em> is found or the object cannot be
1005 dereferenced anymore (in which case, barf).
1006 For example, if
<em><rev
></em> is a commit-ish,
<em><rev
>^{commit}
</em>
1007 describes the corresponding commit object.
1008 Similarly, if
<em><rev
></em> is a tree-ish,
<em><rev
>^{tree}
</em>
1009 describes the corresponding tree object.
1010 <em><rev
>^0</em>
1011 is a short-hand for
<em><rev
>^{commit}
</em>.
1013 <div class=
"paragraph"><p><em><rev
>^{object}
</em> can be used to make sure
<em><rev
></em> names an
1014 object that exists, without requiring
<em><rev
></em> to be a tag, and
1015 without dereferencing
<em><rev
></em>; because a tag is already an object,
1016 it does not have to be dereferenced even once to get to an object.
</p></div>
1017 <div class=
"paragraph"><p><em><rev
>^{tag}
</em> can be used to ensure that
<em><rev
></em> identifies an
1018 existing tag object.
</p></div>
1020 <dt class=
"hdlist1">
1021 <em><rev
>^{}
</em>, e.g.
<em>v0.99
.8^{}
</em>
1025 A suffix
<em>^</em> followed by an empty brace pair
1026 means the object could be a tag,
1027 and dereference the tag recursively until a non-tag object is
1031 <dt class=
"hdlist1">
1032 <em><rev
>^{/
<text
>}
</em>, e.g.
<em>HEAD^{/fix nasty bug}
</em>
1036 A suffix
<em>^</em> to a revision parameter, followed by a brace
1037 pair that contains a text led by a slash,
1038 is the same as the
<em>:/fix nasty bug
</em> syntax below except that
1039 it returns the youngest matching commit which is reachable from
1040 the
<em><rev
></em> before
<em>^</em>.
1043 <dt class=
"hdlist1">
1044 <em>:/
<text
></em>, e.g.
<em>:/fix nasty bug
</em>
1048 A colon, followed by a slash, followed by a text, names
1049 a commit whose commit message matches the specified regular expression.
1050 This name returns the youngest matching commit which is
1051 reachable from any ref, including HEAD.
1052 The regular expression can match any part of the
1053 commit message. To match messages starting with a string, one can use
1054 e.g.
<em>:/^foo
</em>. The special sequence
<em>:/!
</em> is reserved for modifiers to what
1055 is matched.
<em>:/!-foo
</em> performs a negative match, while
<em>:/!!foo
</em> matches a
1056 literal
<em>!
</em> character, followed by
<em>foo
</em>. Any other sequence beginning with
1057 <em>:/!
</em> is reserved for now.
1058 Depending on the given text, the shell
’s word splitting rules might
1059 require additional quoting.
1062 <dt class=
"hdlist1">
1063 <em><rev
>:
<path
></em>, e.g.
<em>HEAD:README
</em>,
<em>master:./README
</em>
1067 A suffix
<em>:
</em> followed by a path names the blob or tree
1068 at the given path in the tree-ish object named by the part
1070 A path starting with
<em>./
</em> or
<em>../
</em> is relative to the current working directory.
1071 The given path will be converted to be relative to the working tree
’s root directory.
1072 This is most useful to address a blob or tree from a commit or tree that has
1073 the same tree structure as the working tree.
1076 <dt class=
"hdlist1">
1077 <em>:[
<n
>:]
<path
></em>, e.g.
<em>:
0:README
</em>,
<em>:README
</em>
1081 A colon, optionally followed by a stage number (
0 to
3) and a
1082 colon, followed by a path, names a blob object in the
1083 index at the given path. A missing stage number (and the colon
1084 that follows it) names a stage
0 entry. During a merge, stage
1085 1 is the common ancestor, stage
2 is the target branch
’s version
1086 (typically the current branch), and stage
3 is the version from
1087 the branch which is being merged.
1091 <div class=
"paragraph"><p>Here is an illustration, by Jon Loeliger. Both commit nodes B
1092 and C are parents of commit node A. Parent commits are ordered
1093 left-to-right.
</p></div>
1094 <div class=
"literalblock">
1095 <div class=
"content">
1107 <div class=
"literalblock">
1108 <div class=
"content">
1109 <pre><code>A = = A^
0
1112 D = A^^ = A^
1^
1 = A~
2
1115 G = A^^^ = A^
1^
1^
1 = A~
3
1116 H = D^
2 = B^^
2 = A^^^
2 = A~
2^
2
1117 I = F^ = B^
3^ = A^^
3^
1118 J = F^
2 = B^
3^
2 = A^^
3^
2</code></pre>
1123 <h2 id=
"_specifying_ranges">SPECIFYING RANGES
</h2>
1124 <div class=
"sectionbody">
1125 <div class=
"paragraph"><p>History traversing commands such as
<code>git log
</code> operate on a set
1126 of commits, not just a single commit.
</p></div>
1127 <div class=
"paragraph"><p>For these commands,
1128 specifying a single revision, using the notation described in the
1129 previous section, means the set of commits
<code>reachable
</code> from the given
1131 <div class=
"paragraph"><p>Specifying several revisions means the set of commits reachable from
1132 any of the given commits.
</p></div>
1133 <div class=
"paragraph"><p>A commit
’s reachable set is the commit itself and the commits in
1134 its ancestry chain.
</p></div>
1135 <div class=
"paragraph"><p>There are several notations to specify a set of connected commits
1136 (called a
"revision range"), illustrated below.
</p></div>
1138 <h3 id=
"_commit_exclusions">Commit Exclusions
</h3>
1139 <div class=
"dlist"><dl>
1140 <dt class=
"hdlist1">
1141 <em>^<rev
></em> (caret) Notation
1145 To exclude commits reachable from a commit, a prefix
<em>^</em>
1146 notation is used. E.g.
<em>^r1 r2
</em> means commits reachable
1147 from
<em>r2
</em> but exclude the ones reachable from
<em>r1
</em> (i.e.
<em>r1
</em> and
1154 <h3 id=
"_dotted_range_notations">Dotted Range Notations
</h3>
1155 <div class=
"dlist"><dl>
1156 <dt class=
"hdlist1">
1157 The
<em>..
</em> (two-dot) Range Notation
1161 The
<em>^r1 r2
</em> set operation appears so often that there is a shorthand
1162 for it. When you have two commits
<em>r1
</em> and
<em>r2
</em> (named according
1163 to the syntax explained in SPECIFYING REVISIONS above), you can ask
1164 for commits that are reachable from r2 excluding those that are reachable
1165 from r1 by
<em>^r1 r2
</em> and it can be written as
<em>r1..r2
</em>.
1168 <dt class=
"hdlist1">
1169 The
<em>...
</em> (three-dot) Symmetric Difference Notation
1173 A similar notation
<em>r1...r2
</em> is called symmetric difference
1174 of
<em>r1
</em> and
<em>r2
</em> and is defined as
1175 <em>r1 r2 --not $(git merge-base --all r1 r2)
</em>.
1176 It is the set of commits that are reachable from either one of
1177 <em>r1
</em> (left side) or
<em>r2
</em> (right side) but not from both.
1181 <div class=
"paragraph"><p>In these two shorthand notations, you can omit one end and let it default to HEAD.
1182 For example,
<em>origin..
</em> is a shorthand for
<em>origin..HEAD
</em> and asks
"What
1183 did I do since I forked from the origin branch?" Similarly,
<em>..origin
</em>
1184 is a shorthand for
<em>HEAD..origin
</em> and asks
"What did the origin do since
1185 I forked from them?" Note that
<em>..
</em> would mean
<em>HEAD..HEAD
</em> which is an
1186 empty range that is both reachable and unreachable from HEAD.
</p></div>
1187 <div class=
"paragraph"><p>Commands that are specifically designed to take two distinct ranges
1188 (e.g.
"git range-diff R1 R2" to compare two ranges) do exist, but
1189 they are exceptions. Unless otherwise noted, all
"git" commands
1190 that operate on a set of commits work on a single revision range.
1191 In other words, writing two
"two-dot range notation" next to each
1192 other, e.g.
</p></div>
1193 <div class=
"literalblock">
1194 <div class=
"content">
1195 <pre><code>$ git log A..B C..D
</code></pre>
1197 <div class=
"paragraph"><p>does
<strong>not
</strong> specify two revision ranges for most commands. Instead
1198 it will name a single connected set of commits, i.e. those that are
1199 reachable from either B or D but are reachable from neither A or C.
1200 In a linear history like this:
</p></div>
1201 <div class=
"literalblock">
1202 <div class=
"content">
1203 <pre><code>---A---B---o---o---C---D
</code></pre>
1205 <div class=
"paragraph"><p>because A and B are reachable from C, the revision range specified
1206 by these two dotted ranges is a single commit D.
</p></div>
1209 <h3 id=
"_other_lt_rev_gt_94_parent_shorthand_notations">Other
<rev
>^ Parent Shorthand Notations
</h3>
1210 <div class=
"paragraph"><p>Three other shorthands exist, particularly useful for merge commits,
1211 for naming a set that is formed by a commit and its parent commits.
</p></div>
1212 <div class=
"paragraph"><p>The
<em>r1
^@
</em> notation means all parents of
<em>r1
</em>.
</p></div>
1213 <div class=
"paragraph"><p>The
<em>r1
^!
</em> notation includes commit
<em>r1
</em> but excludes all of its parents.
1214 By itself, this notation denotes the single commit
<em>r1
</em>.
</p></div>
1215 <div class=
"paragraph"><p>The
<em><rev
>^-[
<n
>]
</em> notation includes
<em><rev
></em> but excludes the
<n
>th
1216 parent (i.e. a shorthand for
<em><rev
>^<n
>..
<rev
></em>), with
<em><n
></em> =
1 if
1217 not given. This is typically useful for merge commits where you
1218 can just pass
<em><commit
>^-
</em> to get all the commits in the branch
1219 that was merged in merge commit
<em><commit
></em> (including
<em><commit
></em>
1221 <div class=
"paragraph"><p>While
<em><rev
>^<n
></em> was about specifying a single commit parent, these
1222 three notations also consider its parents. For example you can say
1223 <em>HEAD
^2^@
</em>, however you cannot say
<em>HEAD
^@
^2</em>.
</p></div>
1228 <h2 id=
"_revision_range_summary">Revision Range Summary
</h2>
1229 <div class=
"sectionbody">
1230 <div class=
"dlist"><dl>
1231 <dt class=
"hdlist1">
1232 <em><rev
></em>
1236 Include commits that are reachable from
<rev
> (i.e.
<rev
> and its
1240 <dt class=
"hdlist1">
1241 <em>^<rev
></em>
1245 Exclude commits that are reachable from
<rev
> (i.e.
<rev
> and its
1249 <dt class=
"hdlist1">
1250 <em><rev1
>..
<rev2
></em>
1254 Include commits that are reachable from
<rev2
> but exclude
1255 those that are reachable from
<rev1
>. When either
<rev1
> or
1256 <rev2
> is omitted, it defaults to
<code>HEAD
</code>.
1259 <dt class=
"hdlist1">
1260 <em><rev1
>...
<rev2
></em>
1264 Include commits that are reachable from either
<rev1
> or
1265 <rev2
> but exclude those that are reachable from both. When
1266 either
<rev1
> or
<rev2
> is omitted, it defaults to
<code>HEAD
</code>.
1269 <dt class=
"hdlist1">
1270 <em><rev
>^@
</em>, e.g.
<em>HEAD
^@
</em>
1274 A suffix
<em>^</em> followed by an at sign is the same as listing
1275 all parents of
<em><rev
></em> (meaning, include anything reachable from
1276 its parents, but not the commit itself).
1279 <dt class=
"hdlist1">
1280 <em><rev
>^!
</em>, e.g.
<em>HEAD
^!
</em>
1284 A suffix
<em>^</em> followed by an exclamation mark is the same
1285 as giving commit
<em><rev
></em> and all its parents prefixed with
1286 <em>^</em> to exclude them (and their ancestors).
1289 <dt class=
"hdlist1">
1290 <em><rev
>^-
<n
></em>, e.g.
<em>HEAD
^-, HEAD
^-
2</em>
1294 Equivalent to
<em><rev
>^<n
>..
<rev
></em>, with
<em><n
></em> =
1 if not
1299 <div class=
"paragraph"><p>Here are a handful of examples using the Loeliger illustration above,
1300 with each step in the notation
’s expansion and selection carefully
1301 spelt out:
</p></div>
1302 <div class=
"literalblock">
1303 <div class=
"content">
1304 <pre><code> Args Expanded arguments Selected commits
1312 B...C = B ^F C G H D E B C
1318 = D E F D G H E F I J
1325 F^! D = F ^I ^J D G H D F
</code></pre>
1330 <h2 id=
"_see_also">SEE ALSO
</h2>
1331 <div class=
"sectionbody">
1332 <div class=
"paragraph"><p><a href=
"git-rev-parse.html">git-rev-parse(
1)
</a></p></div>
1336 <h2 id=
"_git">GIT
</h2>
1337 <div class=
"sectionbody">
1338 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
1342 <div id=
"footnotes"><hr /></div>
1344 <div id=
"footer-text">
1346 2020-
03-
10 15:
02:
33 PDT