gitglossary.html

   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">
   5 <head>
   6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
   7 <meta name="generator" content="AsciiDoc 10.2.0" />
   8 <title>gitglossary(7)</title>
   9 <style type="text/css">
  10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
  11
  12 /* Default font. */
  13 body {
  14   font-family: Georgia,serif;
  15 }
  16
  17 /* Title font. */
  18 h1, h2, h3, h4, h5, h6,
  19 div.title, caption.title,
  20 thead, p.table.header,
  21 #toctitle,
  22 #author, #revnumber, #revdate, #revremark,
  23 #footer {
  24   font-family: Arial,Helvetica,sans-serif;
  25 }
  26
  27 body {
  28   margin: 1em 5% 1em 5%;
  29 }
  30
  31 a {
  32   color: blue;
  33   text-decoration: underline;
  34 }
  35 a:visited {
  36   color: fuchsia;
  37 }
  38
  39 em {
  40   font-style: italic;
  41   color: navy;
  42 }
  43
  44 strong {
  45   font-weight: bold;
  46   color: #083194;
  47 }
  48
  49 h1, h2, h3, h4, h5, h6 {
  50   color: #527bbd;
  51   margin-top: 1.2em;
  52   margin-bottom: 0.5em;
  53   line-height: 1.3;
  54 }
  55
  56 h1, h2, h3 {
  57   border-bottom: 2px solid silver;
  58 }
  59 h2 {
  60   padding-top: 0.5em;
  61 }
  62 h3 {
  63   float: left;
  64 }
  65 h3 + * {
  66   clear: left;
  67 }
  68 h5 {
  69   font-size: 1.0em;
  70 }
  71
  72 div.sectionbody {
  73   margin-left: 0;
  74 }
  75
  76 hr {
  77   border: 1px solid silver;
  78 }
  79
  80 p {
  81   margin-top: 0.5em;
  82   margin-bottom: 0.5em;
  83 }
  84
  85 ul, ol, li > p {
  86   margin-top: 0;
  87 }
  88 ul > li     { color: #aaa; }
  89 ul > li > * { color: black; }
  90
  91 .monospaced, code, pre {
  92   font-family: "Courier New", Courier, monospace;
  93   font-size: inherit;
  94   color: navy;
  95   padding: 0;
  96   margin: 0;
  97 }
  98 pre {
  99   white-space: pre-wrap;
 100 }
 101
 102 #author {
 103   color: #527bbd;
 104   font-weight: bold;
 105   font-size: 1.1em;
 106 }
 107 #email {
 108 }
 109 #revnumber, #revdate, #revremark {
 110 }
 111
 112 #footer {
 113   font-size: small;
 114   border-top: 2px solid silver;
 115   padding-top: 0.5em;
 116   margin-top: 4.0em;
 117 }
 118 #footer-text {
 119   float: left;
 120   padding-bottom: 0.5em;
 121 }
 122 #footer-badges {
 123   float: right;
 124   padding-bottom: 0.5em;
 125 }
 126
 127 #preamble {
 128   margin-top: 1.5em;
 129   margin-bottom: 1.5em;
 130 }
 131 div.imageblock, div.exampleblock, div.verseblock,
 132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 133 div.admonitionblock {
 134   margin-top: 1.0em;
 135   margin-bottom: 1.5em;
 136 }
 137 div.admonitionblock {
 138   margin-top: 2.0em;
 139   margin-bottom: 2.0em;
 140   margin-right: 10%;
 141   color: #606060;
 142 }
 143
 144 div.content { /* Block element content. */
 145   padding: 0;
 146 }
 147
 148 /* Block element titles. */
 149 div.title, caption.title {
 150   color: #527bbd;
 151   font-weight: bold;
 152   text-align: left;
 153   margin-top: 1.0em;
 154   margin-bottom: 0.5em;
 155 }
 156 div.title + * {
 157   margin-top: 0;
 158 }
 159
 160 td div.title:first-child {
 161   margin-top: 0.0em;
 162 }
 163 div.content div.title:first-child {
 164   margin-top: 0.0em;
 165 }
 166 div.content + div.title {
 167   margin-top: 0.0em;
 168 }
 169
 170 div.sidebarblock > div.content {
 171   background: #ffffee;
 172   border: 1px solid #dddddd;
 173   border-left: 4px solid #f0f0f0;
 174   padding: 0.5em;
 175 }
 176
 177 div.listingblock > div.content {
 178   border: 1px solid #dddddd;
 179   border-left: 5px solid #f0f0f0;
 180   background: #f8f8f8;
 181   padding: 0.5em;
 182 }
 183
 184 div.quoteblock, div.verseblock {
 185   padding-left: 1.0em;
 186   margin-left: 1.0em;
 187   margin-right: 10%;
 188   border-left: 5px solid #f0f0f0;
 189   color: #888;
 190 }
 191
 192 div.quoteblock > div.attribution {
 193   padding-top: 0.5em;
 194   text-align: right;
 195 }
 196
 197 div.verseblock > pre.content {
 198   font-family: inherit;
 199   font-size: inherit;
 200 }
 201 div.verseblock > div.attribution {
 202   padding-top: 0.75em;
 203   text-align: left;
 204 }
 205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 206 div.verseblock + div.attribution {
 207   text-align: left;
 208 }
 209
 210 div.admonitionblock .icon {
 211   vertical-align: top;
 212   font-size: 1.1em;
 213   font-weight: bold;
 214   text-decoration: underline;
 215   color: #527bbd;
 216   padding-right: 0.5em;
 217 }
 218 div.admonitionblock td.content {
 219   padding-left: 0.5em;
 220   border-left: 3px solid #dddddd;
 221 }
 222
 223 div.exampleblock > div.content {
 224   border-left: 3px solid #dddddd;
 225   padding-left: 0.5em;
 226 }
 227
 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; }
 231
 232 dl {
 233   margin-top: 0.8em;
 234   margin-bottom: 0.8em;
 235 }
 236 dt {
 237   margin-top: 0.5em;
 238   margin-bottom: 0;
 239   font-style: normal;
 240   color: navy;
 241 }
 242 dd > *:first-child {
 243   margin-top: 0.1em;
 244 }
 245
 246 ul, ol {
 247     list-style-position: outside;
 248 }
 249 ol.arabic {
 250   list-style-type: decimal;
 251 }
 252 ol.loweralpha {
 253   list-style-type: lower-alpha;
 254 }
 255 ol.upperalpha {
 256   list-style-type: upper-alpha;
 257 }
 258 ol.lowerroman {
 259   list-style-type: lower-roman;
 260 }
 261 ol.upperroman {
 262   list-style-type: upper-roman;
 263 }
 264
 265 div.compact ul, div.compact ol,
 266 div.compact p, div.compact p,
 267 div.compact div, div.compact div {
 268   margin-top: 0.1em;
 269   margin-bottom: 0.1em;
 270 }
 271
 272 tfoot {
 273   font-weight: bold;
 274 }
 275 td > div.verse {
 276   white-space: pre;
 277 }
 278
 279 div.hdlist {
 280   margin-top: 0.8em;
 281   margin-bottom: 0.8em;
 282 }
 283 div.hdlist tr {
 284   padding-bottom: 15px;
 285 }
 286 dt.hdlist1.strong, td.hdlist1.strong {
 287   font-weight: bold;
 288 }
 289 td.hdlist1 {
 290   vertical-align: top;
 291   font-style: normal;
 292   padding-right: 0.8em;
 293   color: navy;
 294 }
 295 td.hdlist2 {
 296   vertical-align: top;
 297 }
 298 div.hdlist.compact tr {
 299   margin: 0;
 300   padding-bottom: 0;
 301 }
 302
 303 .comment {
 304   background: yellow;
 305 }
 306
 307 .footnote, .footnoteref {
 308   font-size: 0.8em;
 309 }
 310
 311 span.footnote, span.footnoteref {
 312   vertical-align: super;
 313 }
 314
 315 #footnotes {
 316   margin: 20px 0 20px 0;
 317   padding: 7px 0 0 0;
 318 }
 319
 320 #footnotes div.footnote {
 321   margin: 0 0 5px 0;
 322 }
 323
 324 #footnotes hr {
 325   border: none;
 326   border-top: 1px solid silver;
 327   height: 1px;
 328   text-align: left;
 329   margin-left: 0;
 330   width: 20%;
 331   min-width: 100px;
 332 }
 333
 334 div.colist td {
 335   padding-right: 0.5em;
 336   padding-bottom: 0.3em;
 337   vertical-align: top;
 338 }
 339 div.colist td img {
 340   margin-top: 0.3em;
 341 }
 342
 343 @media print {
 344   #footer-badges { display: none; }
 345 }
 346
 347 #toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 #toctitle {
 352   color: #527bbd;
 353   font-size: 1.1em;
 354   font-weight: bold;
 355   margin-top: 1.0em;
 356   margin-bottom: 0.1em;
 357 }
 358
 359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 360   margin-top: 0;
 361   margin-bottom: 0;
 362 }
 363 div.toclevel2 {
 364   margin-left: 2em;
 365   font-size: 0.9em;
 366 }
 367 div.toclevel3 {
 368   margin-left: 4em;
 369   font-size: 0.9em;
 370 }
 371 div.toclevel4 {
 372   margin-left: 6em;
 373   font-size: 0.9em;
 374 }
 375
 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; }
 392
 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; }
 409
 410 span.big { font-size: 2em; }
 411 span.small { font-size: 0.6em; }
 412
 413 span.underline { text-decoration: underline; }
 414 span.overline { text-decoration: overline; }
 415 span.line-through { text-decoration: line-through; }
 416
 417 div.unbreakable { page-break-inside: avoid; }
 418
 419
 420 /*
 421  * xhtml11 specific
 422  *
 423  * */
 424
 425 div.tableblock {
 426   margin-top: 1.0em;
 427   margin-bottom: 1.5em;
 428 }
 429 div.tableblock > table {
 430   border: 3px solid #527bbd;
 431 }
 432 thead, p.table.header {
 433   font-weight: bold;
 434   color: #527bbd;
 435 }
 436 p.table {
 437   margin-top: 0;
 438 }
 439 /* Because the table frame attribute is overridden by CSS in most browsers. */
 440 div.tableblock > table[frame="void"] {
 441   border-style: none;
 442 }
 443 div.tableblock > table[frame="hsides"] {
 444   border-left-style: none;
 445   border-right-style: none;
 446 }
 447 div.tableblock > table[frame="vsides"] {
 448   border-top-style: none;
 449   border-bottom-style: none;
 450 }
 451
 452
 453 /*
 454  * html5 specific
 455  *
 456  * */
 457
 458 table.tableblock {
 459   margin-top: 1.0em;
 460   margin-bottom: 1.5em;
 461 }
 462 thead, p.tableblock.header {
 463   font-weight: bold;
 464   color: #527bbd;
 465 }
 466 p.tableblock {
 467   margin-top: 0;
 468 }
 469 table.tableblock {
 470   border-width: 3px;
 471   border-spacing: 0px;
 472   border-style: solid;
 473   border-color: #527bbd;
 474   border-collapse: collapse;
 475 }
 476 th.tableblock, td.tableblock {
 477   border-width: 1px;
 478   padding: 4px;
 479   border-style: solid;
 480   border-color: #527bbd;
 481 }
 482
 483 table.tableblock.frame-topbot {
 484   border-left-style: hidden;
 485   border-right-style: hidden;
 486 }
 487 table.tableblock.frame-sides {
 488   border-top-style: hidden;
 489   border-bottom-style: hidden;
 490 }
 491 table.tableblock.frame-none {
 492   border-style: hidden;
 493 }
 494
 495 th.tableblock.halign-left, td.tableblock.halign-left {
 496   text-align: left;
 497 }
 498 th.tableblock.halign-center, td.tableblock.halign-center {
 499   text-align: center;
 500 }
 501 th.tableblock.halign-right, td.tableblock.halign-right {
 502   text-align: right;
 503 }
 504
 505 th.tableblock.valign-top, td.tableblock.valign-top {
 506   vertical-align: top;
 507 }
 508 th.tableblock.valign-middle, td.tableblock.valign-middle {
 509   vertical-align: middle;
 510 }
 511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 512   vertical-align: bottom;
 513 }
 514
 515
 516 /*
 517  * manpage specific
 518  *
 519  * */
 520
 521 body.manpage h1 {
 522   padding-top: 0.5em;
 523   padding-bottom: 0.5em;
 524   border-top: 2px solid silver;
 525   border-bottom: 2px solid silver;
 526 }
 527 body.manpage h2 {
 528   border-style: none;
 529 }
 530 body.manpage div.sectionbody {
 531   margin-left: 3em;
 532 }
 533
 534 @media print {
 535   body.manpage div#toc { display: none; }
 536 }
 537
 538
 539 </style>
 540 <script type="text/javascript">
 541 /*<![CDATA[*/
 542 var asciidoc = {  // Namespace.
 543
 544 /////////////////////////////////////////////////////////////////////
 545 // Table Of Contents generator
 546 /////////////////////////////////////////////////////////////////////
 547
 548 /* Author: Mihai Bazon, September 2002
 549  * http://students.infoiasi.ro/~mishoo
 550  *
 551  * Table Of Content generator
 552  * Version: 0.4
 553  *
 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.
 556  */
 557
 558  /* modified by Troy D. Hanson, September 2006. License: GPL */
 559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 560
 561 // toclevels = 1..4.
 562 toc: function (toclevels) {
 563
 564   function getText(el) {
 565     var text = "";
 566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 568         text += i.data;
 569       else if (i.firstChild != null)
 570         text += getText(i);
 571     }
 572     return text;
 573   }
 574
 575   function TocEntry(el, text, toclevel) {
 576     this.element = el;
 577     this.text = text;
 578     this.toclevel = toclevel;
 579   }
 580
 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
 586     // browsers).
 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);
 593           }
 594           iterate(i);
 595         }
 596       }
 597     }
 598     iterate(el);
 599     return result;
 600   }
 601
 602   var toc = document.getElementById("toc");
 603   if (!toc) {
 604     return;
 605   }
 606
 607   // Delete existing TOC entries in case we're reloading the TOC.
 608   var tocEntriesToRemove = [];
 609   var i;
 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);
 616   }
 617   for (i = 0; i < tocEntriesToRemove.length; i++) {
 618     toc.removeChild(tocEntriesToRemove[i]);
 619   }
 620
 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");
 631     div.appendChild(a);
 632     div.className = "toclevel" + entry.toclevel;
 633     toc.appendChild(div);
 634   }
 635   if (entries.length == 0)
 636     toc.parentNode.removeChild(toc);
 637 },
 638
 639
 640 /////////////////////////////////////////////////////////////////////
 641 // Footnotes generator
 642 /////////////////////////////////////////////////////////////////////
 643
 644 /* Based on footnote generation code from:
 645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 646  */
 647
 648 footnotes: function () {
 649   // Delete existing footnote entries in case we're reloading the footnodes.
 650   var i;
 651   var noteholder = document.getElementById("footnotes");
 652   if (!noteholder) {
 653     return;
 654   }
 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);
 660   }
 661   for (i = 0; i < entriesToRemove.length; i++) {
 662     noteholder.removeChild(entriesToRemove[i]);
 663   }
 664
 665   // Rebuild footnote entries.
 666   var cont = document.getElementById("content");
 667   var spans = cont.getElementsByTagName("span");
 668   var refs = {};
 669   var n = 0;
 670   for (i=0; i<spans.length; i++) {
 671     if (spans[i].className == "footnote") {
 672       n++;
 673       var note = spans[i].getAttribute("data-note");
 674       if (!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];
 678         spans[i].innerHTML =
 679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 680           "' title='View footnote' class='footnote'>" + n + "</a>]";
 681         spans[i].setAttribute("data-note", note);
 682       }
 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;
 689     }
 690   }
 691   if (n == 0)
 692     noteholder.parentNode.removeChild(noteholder);
 693   else {
 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.
 699         n = refs[href];
 700         spans[i].innerHTML =
 701           "[<a href='#_footnote_" + n +
 702           "' title='View footnote' class='footnote'>" + n + "</a>]";
 703       }
 704     }
 705   }
 706 },
 707
 708 install: function(toclevels) {
 709   var timerId;
 710
 711   function reinstall() {
 712     asciidoc.footnotes();
 713     if (toclevels) {
 714       asciidoc.toc(toclevels);
 715     }
 716   }
 717
 718   function reinstallAndRemoveTimer() {
 719     clearInterval(timerId);
 720     reinstall();
 721   }
 722
 723   timerId = setInterval(reinstall, 500);
 724   if (document.addEventListener)
 725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 726   else
 727     window.onload = reinstallAndRemoveTimer;
 728 }
 729
 730 }
 731 asciidoc.install();
 732 /*]]>*/
 733 </script>
 734 </head>
 735 <body class="manpage">
 736 <div id="header">
 737 <h1>
 738 gitglossary(7) Manual Page
 739 </h1>
 740 <h2>NAME</h2>
 741 <div class="sectionbody">
 742 <p>gitglossary -
 743    A Git Glossary
 744 </p>
 745 </div>
 746 </div>
 747 <div id="content">
 748 <div class="sect1">
 749 <h2 id="_synopsis">SYNOPSIS</h2>
 750 <div class="sectionbody">
 751 <div class="paragraph"><p>*</p></div>
 752 </div>
 753 </div>
 754 <div class="sect1">
 755 <h2 id="_description">DESCRIPTION</h2>
 756 <div class="sectionbody">
 757 <div class="dlist"><dl>
 758 <dt class="hdlist1">
 759 <a id="def_alternate_object_database"></a>alternate object database
 760 </dt>
 761 <dd>
 762 <p>
 763         Via the alternates mechanism, a <a href="#def_repository">repository</a>
 764         can inherit part of its <a href="#def_object_database">object database</a>
 765         from another object database, which is called an "alternate".
 766 </p>
 767 </dd>
 768 <dt class="hdlist1">
 769 <a id="def_bare_repository"></a>bare repository
 770 </dt>
 771 <dd>
 772 <p>
 773         A bare repository is normally an appropriately
 774         named <a href="#def_directory">directory</a> with a <code>.git</code> suffix that does not
 775         have a locally checked-out copy of any of the files under
 776         revision control. That is, all of the Git
 777         administrative and control files that would normally be present in the
 778         hidden <code>.git</code> sub-directory are directly present in the
 779         <code>repository.git</code> directory instead,
 780         and no other files are present and checked out. Usually publishers of
 781         public repositories make bare repositories available.
 782 </p>
 783 </dd>
 784 <dt class="hdlist1">
 785 <a id="def_blob_object"></a>blob object
 786 </dt>
 787 <dd>
 788 <p>
 789         Untyped <a href="#def_object">object</a>, e.g. the contents of a file.
 790 </p>
 791 </dd>
 792 <dt class="hdlist1">
 793 <a id="def_branch"></a>branch
 794 </dt>
 795 <dd>
 796 <p>
 797         A "branch" is a line of development.  The most recent
 798         <a href="#def_commit">commit</a> on a branch is referred to as the tip of
 799         that branch.  The tip of the branch is <a href="#def_ref">referenced</a> by a branch
 800         <a href="#def_head">head</a>, which moves forward as additional development
 801         is done on the branch.  A single Git
 802         <a href="#def_repository">repository</a> can track an arbitrary number of
 803         branches, but your <a href="#def_working_tree">working tree</a> is
 804         associated with just one of them (the "current" or "checked out"
 805         branch), and <a href="#def_HEAD">HEAD</a> points to that branch.
 806 </p>
 807 </dd>
 808 <dt class="hdlist1">
 809 <a id="def_cache"></a>cache
 810 </dt>
 811 <dd>
 812 <p>
 813         Obsolete for: <a href="#def_index">index</a>.
 814 </p>
 815 </dd>
 816 <dt class="hdlist1">
 817 <a id="def_chain"></a>chain
 818 </dt>
 819 <dd>
 820 <p>
 821         A list of objects, where each <a href="#def_object">object</a> in the list contains
 822         a reference to its successor (for example, the successor of a
 823         <a href="#def_commit">commit</a> could be one of its <a href="#def_parent">parents</a>).
 824 </p>
 825 </dd>
 826 <dt class="hdlist1">
 827 <a id="def_changeset"></a>changeset
 828 </dt>
 829 <dd>
 830 <p>
 831         BitKeeper/cvsps speak for "<a href="#def_commit">commit</a>". Since Git does not
 832         store changes, but states, it really does not make sense to use the term
 833         "changesets" with Git.
 834 </p>
 835 </dd>
 836 <dt class="hdlist1">
 837 <a id="def_checkout"></a>checkout
 838 </dt>
 839 <dd>
 840 <p>
 841         The action of updating all or part of the
 842         <a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a>
 843         or <a href="#def_blob_object">blob</a> from the
 844         <a href="#def_object_database">object database</a>, and updating the
 845         <a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has
 846         been pointed at a new <a href="#def_branch">branch</a>.
 847 </p>
 848 </dd>
 849 <dt class="hdlist1">
 850 <a id="def_cherry-picking"></a>cherry-picking
 851 </dt>
 852 <dd>
 853 <p>
 854         In <a href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of
 855         changes out of a series of changes (typically commits) and record them
 856         as a new series of changes on top of a different codebase. In Git, this is
 857         performed by the "git cherry-pick" command to extract the change introduced
 858         by an existing <a href="#def_commit">commit</a> and to record it based on the tip
 859         of the current <a href="#def_branch">branch</a> as a new commit.
 860 </p>
 861 </dd>
 862 <dt class="hdlist1">
 863 <a id="def_clean"></a>clean
 864 </dt>
 865 <dd>
 866 <p>
 867         A <a href="#def_working_tree">working tree</a> is clean, if it
 868         corresponds to the <a href="#def_revision">revision</a> referenced by the current
 869         <a href="#def_head">head</a>. Also see "<a href="#def_dirty">dirty</a>".
 870 </p>
 871 </dd>
 872 <dt class="hdlist1">
 873 <a id="def_commit"></a>commit
 874 </dt>
 875 <dd>
 876 <p>
 877         As a noun: A single point in the
 878         Git history; the entire history of a project is represented as a
 879         set of interrelated commits.  The word "commit" is often
 880         used by Git in the same places other revision control systems
 881         use the words "revision" or "version".  Also used as a short
 882         hand for <a href="#def_commit_object">commit object</a>.
 883 </p>
 884 <div class="paragraph"><p>As a verb: The action of storing a new snapshot of the project&#8217;s
 885 state in the Git history, by creating a new commit representing the current
 886 state of the <a href="#def_index">index</a> and advancing <a href="#def_HEAD">HEAD</a>
 887 to point at the new commit.</p></div>
 888 </dd>
 889 <dt class="hdlist1">
 890 <a id="def_commit_graph_general"></a>commit graph concept, representations and usage
 891 </dt>
 892 <dd>
 893 <p>
 894         A synonym for the <a href="#def_DAG">DAG</a> structure formed by the commits
 895         in the object database, <a href="#def_ref">referenced</a> by branch tips,
 896         using their <a href="#def_chain">chain</a> of linked commits.
 897         This structure is the definitive commit graph. The
 898         graph can be represented in other ways, e.g. the
 899         <a href="#def_commit_graph_file">"commit-graph" file</a>.
 900 </p>
 901 </dd>
 902 <dt class="hdlist1">
 903 <a id="def_commit_graph_file"></a>commit-graph file
 904 </dt>
 905 <dd>
 906 <p>
 907         The "commit-graph" (normally hyphenated) file is a supplemental
 908         representation of the <a href="#def_commit_graph_general">commit graph</a>
 909         which accelerates commit graph walks. The "commit-graph" file is
 910         stored either in the .git/objects/info directory or in the info
 911         directory of an alternate object database.
 912 </p>
 913 </dd>
 914 <dt class="hdlist1">
 915 <a id="def_commit_object"></a>commit object
 916 </dt>
 917 <dd>
 918 <p>
 919         An <a href="#def_object">object</a> which contains the information about a
 920         particular <a href="#def_revision">revision</a>, such as <a href="#def_parent">parents</a>, committer,
 921         author, date and the <a href="#def_tree_object">tree object</a> which corresponds
 922         to the top <a href="#def_directory">directory</a> of the stored
 923         revision.
 924 </p>
 925 </dd>
 926 <dt class="hdlist1">
 927 <a id="def_commit-ish"></a>commit-ish (also committish)
 928 </dt>
 929 <dd>
 930 <p>
 931         A <a href="#def_commit_object">commit object</a> or an
 932         <a href="#def_object">object</a> that can be recursively dereferenced to
 933         a commit object.
 934         The following are all commit-ishes:
 935         a commit object,
 936         a <a href="#def_tag_object">tag object</a> that points to a commit
 937         object,
 938         a tag object that points to a tag object that points to a
 939         commit object,
 940         etc.
 941 </p>
 942 </dd>
 943 <dt class="hdlist1">
 944 <a id="def_core_git"></a>core Git
 945 </dt>
 946 <dd>
 947 <p>
 948         Fundamental data structures and utilities of Git. Exposes only limited
 949         source code management tools.
 950 </p>
 951 </dd>
 952 <dt class="hdlist1">
 953 <a id="def_DAG"></a>DAG
 954 </dt>
 955 <dd>
 956 <p>
 957         Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a
 958         directed acyclic graph, because they have parents (directed), and the
 959         graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a>
 960         which begins and ends with the same <a href="#def_object">object</a>).
 961 </p>
 962 </dd>
 963 <dt class="hdlist1">
 964 <a id="def_dangling_object"></a>dangling object
 965 </dt>
 966 <dd>
 967 <p>
 968         An <a href="#def_unreachable_object">unreachable object</a> which is not
 969         <a href="#def_reachable">reachable</a> even from other unreachable objects; a
 970         dangling object has no references to it from any
 971         reference or <a href="#def_object">object</a> in the <a href="#def_repository">repository</a>.
 972 </p>
 973 </dd>
 974 <dt class="hdlist1">
 975 <a id="def_detached_HEAD"></a>detached HEAD
 976 </dt>
 977 <dd>
 978 <p>
 979         Normally the <a href="#def_HEAD">HEAD</a> stores the name of a
 980         <a href="#def_branch">branch</a>, and commands that operate on the
 981         history HEAD represents operate on the history leading to the
 982         tip of the branch the HEAD points at.  However, Git also
 983         allows you to <a href="#def_checkout">check out</a> an arbitrary
 984         <a href="#def_commit">commit</a> that isn&#8217;t necessarily the tip of any
 985         particular branch.  The HEAD in such a state is called
 986         "detached".
 987 </p>
 988 <div class="paragraph"><p>Note that commands that operate on the history of the current branch
 989 (e.g. <code>git commit</code> to build a new history on top of it) still work
 990 while the HEAD is detached. They update the HEAD to point at the tip
 991 of the updated history without affecting any branch.  Commands that
 992 update or inquire information <em>about</em> the current branch (e.g. <code>git
 993 branch --set-upstream-to</code> that sets what remote-tracking branch the
 994 current branch integrates with) obviously do not work, as there is no
 995 (real) current branch to ask about in this state.</p></div>
 996 </dd>
 997 <dt class="hdlist1">
 998 <a id="def_directory"></a>directory
 999 </dt>
1000 <dd>
1001 <p>
1002         The list you get with "ls" :-)
1003 </p>
1004 </dd>
1005 <dt class="hdlist1">
1006 <a id="def_dirty"></a>dirty
1007 </dt>
1008 <dd>
1009 <p>
1010         A <a href="#def_working_tree">working tree</a> is said to be "dirty" if
1011         it contains modifications which have not been <a href="#def_commit">committed</a> to the current
1012         <a href="#def_branch">branch</a>.
1013 </p>
1014 </dd>
1015 <dt class="hdlist1">
1016 <a id="def_evil_merge"></a>evil merge
1017 </dt>
1018 <dd>
1019 <p>
1020         An evil merge is a <a href="#def_merge">merge</a> that introduces changes that
1021         do not appear in any <a href="#def_parent">parent</a>.
1022 </p>
1023 </dd>
1024 <dt class="hdlist1">
1025 <a id="def_fast_forward"></a>fast-forward
1026 </dt>
1027 <dd>
1028 <p>
1029         A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a
1030         <a href="#def_revision">revision</a> and you are "merging" another
1031         <a href="#def_branch">branch</a>'s changes that happen to be a descendant of what
1032         you have. In such a case, you do not make a new <a href="#def_merge">merge</a>
1033         <a href="#def_commit">commit</a> but instead just update your branch to point at the same
1034         revision as the branch you are merging. This will happen frequently on a
1035         <a href="#def_remote_tracking_branch">remote-tracking branch</a> of a remote
1036         <a href="#def_repository">repository</a>.
1037 </p>
1038 </dd>
1039 <dt class="hdlist1">
1040 <a id="def_fetch"></a>fetch
1041 </dt>
1042 <dd>
1043 <p>
1044         Fetching a <a href="#def_branch">branch</a> means to get the
1045         branch&#8217;s <a href="#def_head_ref">head ref</a> from a remote
1046         <a href="#def_repository">repository</a>, to find out which objects are
1047         missing from the local <a href="#def_object_database">object database</a>,
1048         and to get them, too.  See also <a href="git-fetch.html">git-fetch(1)</a>.
1049 </p>
1050 </dd>
1051 <dt class="hdlist1">
1052 <a id="def_file_system"></a>file system
1053 </dt>
1054 <dd>
1055 <p>
1056         Linus Torvalds originally designed Git to be a user space file system,
1057         i.e. the infrastructure to hold files and directories. That ensured the
1058         efficiency and speed of Git.
1059 </p>
1060 </dd>
1061 <dt class="hdlist1">
1062 <a id="def_git_archive"></a>Git archive
1063 </dt>
1064 <dd>
1065 <p>
1066         Synonym for <a href="#def_repository">repository</a> (for arch people).
1067 </p>
1068 </dd>
1069 <dt class="hdlist1">
1070 <a id="def_gitfile"></a>gitfile
1071 </dt>
1072 <dd>
1073 <p>
1074         A plain file <code>.git</code> at the root of a working tree that
1075         points at the directory that is the real repository.
1076 </p>
1077 </dd>
1078 <dt class="hdlist1">
1079 <a id="def_grafts"></a>grafts
1080 </dt>
1081 <dd>
1082 <p>
1083         Grafts enable two otherwise different lines of development to be joined
1084         together by recording fake ancestry information for commits. This way
1085         you can make Git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has
1086         is different from what was recorded when the commit was
1087         created. Configured via the <code>.git/info/grafts</code> file.
1088 </p>
1089 <div class="paragraph"><p>Note that the grafts mechanism is outdated and can lead to problems
1090 transferring objects between repositories; see <a href="git-replace.html">git-replace(1)</a>
1091 for a more flexible and robust system to do the same thing.</p></div>
1092 </dd>
1093 <dt class="hdlist1">
1094 <a id="def_hash"></a>hash
1095 </dt>
1096 <dd>
1097 <p>
1098         In Git&#8217;s context, synonym for <a href="#def_object_name">object name</a>.
1099 </p>
1100 </dd>
1101 <dt class="hdlist1">
1102 <a id="def_head"></a>head
1103 </dt>
1104 <dd>
1105 <p>
1106         A <a href="#def_ref">named reference</a> to the <a href="#def_commit">commit</a> at the tip of a
1107         <a href="#def_branch">branch</a>.  Heads are stored in a file in
1108         <code>$GIT_DIR/refs/heads/</code> directory, except when using packed refs. (See
1109         <a href="git-pack-refs.html">git-pack-refs(1)</a>.)
1110 </p>
1111 </dd>
1112 <dt class="hdlist1">
1113 <a id="def_HEAD"></a>HEAD
1114 </dt>
1115 <dd>
1116 <p>
1117         The current <a href="#def_branch">branch</a>.  In more detail: Your <a href="#def_working_tree">working tree</a> is normally derived from the state of the tree
1118         referred to by HEAD.  HEAD is a reference to one of the
1119         <a href="#def_head">heads</a> in your repository, except when using a
1120         <a href="#def_detached_HEAD">detached HEAD</a>, in which case it directly
1121         references an arbitrary commit.
1122 </p>
1123 </dd>
1124 <dt class="hdlist1">
1125 <a id="def_head_ref"></a>head ref
1126 </dt>
1127 <dd>
1128 <p>
1129         A synonym for <a href="#def_head">head</a>.
1130 </p>
1131 </dd>
1132 <dt class="hdlist1">
1133 <a id="def_hook"></a>hook
1134 </dt>
1135 <dd>
1136 <p>
1137         During the normal execution of several Git commands, call-outs are made
1138         to optional scripts that allow a developer to add functionality or
1139         checking. Typically, the hooks allow for a command to be pre-verified
1140         and potentially aborted, and allow for a post-notification after the
1141         operation is done. The hook scripts are found in the
1142         <code>$GIT_DIR/hooks/</code> directory, and are enabled by simply
1143         removing the <code>.sample</code> suffix from the filename. In earlier versions
1144         of Git you had to make them executable.
1145 </p>
1146 </dd>
1147 <dt class="hdlist1">
1148 <a id="def_index"></a>index
1149 </dt>
1150 <dd>
1151 <p>
1152         A collection of files with stat information, whose contents are stored
1153         as objects. The index is a stored version of your
1154         <a href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even
1155         a third version of a working tree, which are used
1156         when <a href="#def_merge">merging</a>.
1157 </p>
1158 </dd>
1159 <dt class="hdlist1">
1160 <a id="def_index_entry"></a>index entry
1161 </dt>
1162 <dd>
1163 <p>
1164         The information regarding a particular file, stored in the
1165         <a href="#def_index">index</a>. An index entry can be unmerged, if a
1166         <a href="#def_merge">merge</a> was started, but not yet finished (i.e. if
1167         the index contains multiple versions of that file).
1168 </p>
1169 </dd>
1170 <dt class="hdlist1">
1171 <a id="def_master"></a>master
1172 </dt>
1173 <dd>
1174 <p>
1175         The default development <a href="#def_branch">branch</a>. Whenever you
1176         create a Git <a href="#def_repository">repository</a>, a branch named
1177         "master" is created, and becomes the active branch. In most
1178         cases, this contains the local development, though that is
1179         purely by convention and is not required.
1180 </p>
1181 </dd>
1182 <dt class="hdlist1">
1183 <a id="def_merge"></a>merge
1184 </dt>
1185 <dd>
1186 <p>
1187         As a verb: To bring the contents of another
1188         <a href="#def_branch">branch</a> (possibly from an external
1189         <a href="#def_repository">repository</a>) into the current branch.  In the
1190         case where the merged-in branch is from a different repository,
1191         this is done by first <a href="#def_fetch">fetching</a> the remote branch
1192         and then merging the result into the current branch.  This
1193         combination of fetch and merge operations is called a
1194         <a href="#def_pull">pull</a>.  Merging is performed by an automatic process
1195         that identifies changes made since the branches diverged, and
1196         then applies all those changes together.  In cases where changes
1197         conflict, manual intervention may be required to complete the
1198         merge.
1199 </p>
1200 <div class="paragraph"><p>As a noun: unless it is a <a href="#def_fast_forward">fast-forward</a>, a
1201 successful merge results in the creation of a new <a href="#def_commit">commit</a>
1202 representing the result of the merge, and having as
1203 <a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>.
1204 This commit is referred to as a "merge commit", or sometimes just a
1205 "merge".</p></div>
1206 </dd>
1207 <dt class="hdlist1">
1208 <a id="def_object"></a>object
1209 </dt>
1210 <dd>
1211 <p>
1212         The unit of storage in Git. It is uniquely identified by the
1213         <a href="#def_SHA1">SHA-1</a> of its contents. Consequently, an
1214         object cannot be changed.
1215 </p>
1216 </dd>
1217 <dt class="hdlist1">
1218 <a id="def_object_database"></a>object database
1219 </dt>
1220 <dd>
1221 <p>
1222         Stores a set of "objects", and an individual <a href="#def_object">object</a> is
1223         identified by its <a href="#def_object_name">object name</a>. The objects usually
1224         live in <code>$GIT_DIR/objects/</code>.
1225 </p>
1226 </dd>
1227 <dt class="hdlist1">
1228 <a id="def_object_identifier"></a>object identifier (oid)
1229 </dt>
1230 <dd>
1231 <p>
1232         Synonym for <a href="#def_object_name">object name</a>.
1233 </p>
1234 </dd>
1235 <dt class="hdlist1">
1236 <a id="def_object_name"></a>object name
1237 </dt>
1238 <dd>
1239 <p>
1240         The unique identifier of an <a href="#def_object">object</a>.  The
1241         object name is usually represented by a 40 character
1242         hexadecimal string.  Also colloquially called <a href="#def_SHA1">SHA-1</a>.
1243 </p>
1244 </dd>
1245 <dt class="hdlist1">
1246 <a id="def_object_type"></a>object type
1247 </dt>
1248 <dd>
1249 <p>
1250         One of the identifiers "<a href="#def_commit_object">commit</a>",
1251         "<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or
1252         "<a href="#def_blob_object">blob</a>" describing the type of an
1253         <a href="#def_object">object</a>.
1254 </p>
1255 </dd>
1256 <dt class="hdlist1">
1257 <a id="def_octopus"></a>octopus
1258 </dt>
1259 <dd>
1260 <p>
1261         To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>.
1262 </p>
1263 </dd>
1264 <dt class="hdlist1">
1265 <a id="def_origin"></a>origin
1266 </dt>
1267 <dd>
1268 <p>
1269         The default upstream <a href="#def_repository">repository</a>. Most projects have
1270         at least one upstream project which they track. By default
1271         <em>origin</em> is used for that purpose. New upstream updates
1272         will be fetched into <a href="#def_remote_tracking_branch">remote-tracking branches</a> named
1273         origin/name-of-upstream-branch, which you can see using
1274         <code>git branch -r</code>.
1275 </p>
1276 </dd>
1277 <dt class="hdlist1">
1278 <a id="def_overlay"></a>overlay
1279 </dt>
1280 <dd>
1281 <p>
1282         Only update and add files to the working directory, but don&#8217;t
1283         delete them, similar to how <em>cp -R</em> would update the contents
1284         in the destination directory.  This is the default mode in a
1285         <a href="#def_checkout">checkout</a> when checking out files from the
1286         <a href="#def_index">index</a> or a <a href="#def_tree-ish">tree-ish</a>.  In
1287         contrast, no-overlay mode also deletes tracked files not
1288         present in the source, similar to <em>rsync --delete</em>.
1289 </p>
1290 </dd>
1291 <dt class="hdlist1">
1292 <a id="def_pack"></a>pack
1293 </dt>
1294 <dd>
1295 <p>
1296         A set of objects which have been compressed into one file (to save space
1297         or to transmit them efficiently).
1298 </p>
1299 </dd>
1300 <dt class="hdlist1">
1301 <a id="def_pack_index"></a>pack index
1302 </dt>
1303 <dd>
1304 <p>
1305         The list of identifiers, and other information, of the objects in a
1306         <a href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a
1307         pack.
1308 </p>
1309 </dd>
1310 <dt class="hdlist1">
1311 <a id="def_pathspec"></a>pathspec
1312 </dt>
1313 <dd>
1314 <p>
1315         Pattern used to limit paths in Git commands.
1316 </p>
1317 <div class="paragraph"><p>Pathspecs are used on the command line of "git ls-files", "git
1318 ls-tree", "git add", "git grep", "git diff", "git checkout",
1319 and many other commands to
1320 limit the scope of operations to some subset of the tree or
1321 working tree.  See the documentation of each command for whether
1322 paths are relative to the current directory or toplevel.  The
1323 pathspec syntax is as follows:</p></div>
1324 <div class="openblock">
1325 <div class="content">
1326 <div class="ulist"><ul>
1327 <li>
1328 <p>
1329 any path matches itself
1330 </p>
1331 </li>
1332 <li>
1333 <p>
1334 the pathspec up to the last slash represents a
1335   directory prefix.  The scope of that pathspec is
1336   limited to that subtree.
1337 </p>
1338 </li>
1339 <li>
1340 <p>
1341 the rest of the pathspec is a pattern for the remainder
1342   of the pathname.  Paths relative to the directory
1343   prefix will be matched against that pattern using fnmatch(3);
1344   in particular, <em>*</em> and <em>?</em> <em>can</em> match directory separators.
1345 </p>
1346 </li>
1347 </ul></div>
1348 </div></div>
1349 <div class="paragraph"><p>For example, Documentation/*.jpg will match all .jpg files
1350 in the Documentation subtree,
1351 including Documentation/chapter_1/figure_1.jpg.</p></div>
1352 <div class="paragraph"><p>A pathspec that begins with a colon <code>:</code> has special meaning.  In the
1353 short form, the leading colon <code>:</code> is followed by zero or more "magic
1354 signature" letters (which optionally is terminated by another colon <code>:</code>),
1355 and the remainder is the pattern to match against the path.
1356 The "magic signature" consists of ASCII symbols that are neither
1357 alphanumeric, glob, regex special characters nor colon.
1358 The optional colon that terminates the "magic signature" can be
1359 omitted if the pattern begins with a character that does not belong to
1360 "magic signature" symbol set and is not a colon.</p></div>
1361 <div class="paragraph"><p>In the long form, the leading colon <code>:</code> is followed by an open
1362 parenthesis <code>(</code>, a comma-separated list of zero or more "magic words",
1363 and a close parentheses <code>)</code>, and the remainder is the pattern to match
1364 against the path.</p></div>
1365 <div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form
1366 should not be combined with other pathspec.</p></div>
1367 <div class="openblock">
1368 <div class="content">
1369 <div class="dlist"><dl>
1370 <dt class="hdlist1">
1371 top
1372 </dt>
1373 <dd>
1374 <p>
1375         The magic word <code>top</code> (magic signature: <code>/</code>) makes the pattern
1376         match from the root of the working tree, even when you are
1377         running the command from inside a subdirectory.
1378 </p>
1379 </dd>
1380 <dt class="hdlist1">
1381 literal
1382 </dt>
1383 <dd>
1384 <p>
1385         Wildcards in the pattern such as <code>*</code> or <code>?</code> are treated
1386         as literal characters.
1387 </p>
1388 </dd>
1389 <dt class="hdlist1">
1390 icase
1391 </dt>
1392 <dd>
1393 <p>
1394         Case insensitive match.
1395 </p>
1396 </dd>
1397 <dt class="hdlist1">
1398 glob
1399 </dt>
1400 <dd>
1401 <p>
1402         Git treats the pattern as a shell glob suitable for
1403         consumption by fnmatch(3) with the FNM_PATHNAME flag:
1404         wildcards in the pattern will not match a / in the pathname.
1405         For example, "Documentation/&#42;.html" matches
1406         "Documentation/git.html" but not "Documentation/ppc/ppc.html"
1407         or "tools/perf/Documentation/perf.html".
1408 </p>
1409 <div class="paragraph"><p>Two consecutive asterisks ("<code>**</code>") in patterns matched against
1410 full pathname may have special meaning:</p></div>
1411 <div class="ulist"><ul>
1412 <li>
1413 <p>
1414 A leading "<code>**</code>" followed by a slash means match in all
1415    directories. For example, "<code>**/foo</code>" matches file or directory
1416    "<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>"
1417    matches file or directory "<code>bar</code>" anywhere that is directly
1418    under directory "<code>foo</code>".
1419 </p>
1420 </li>
1421 <li>
1422 <p>
1423 A trailing "<code>/**</code>" matches everything inside. For example,
1424    "<code>abc/**</code>" matches all files inside directory "abc", relative
1425    to the location of the <code>.gitignore</code> file, with infinite depth.
1426 </p>
1427 </li>
1428 <li>
1429 <p>
1430 A slash followed by two consecutive asterisks then a slash
1431    matches zero or more directories. For example, "<code>a/**/b</code>"
1432    matches "<code>a/b</code>", "<code>a/x/b</code>", "<code>a/x/y/b</code>" and so on.
1433 </p>
1434 </li>
1435 <li>
1436 <p>
1437 Other consecutive asterisks are considered invalid.
1438 </p>
1439 <div class="paragraph"><p>Glob magic is incompatible with literal magic.</p></div>
1440 </li>
1441 </ul></div>
1442 </dd>
1443 <dt class="hdlist1">
1444 attr
1445 </dt>
1446 <dd>
1447 <p>
1448 After <code>attr:</code> comes a space separated list of "attribute
1449 requirements", all of which must be met in order for the
1450 path to be considered a match; this is in addition to the
1451 usual non-magic pathspec pattern matching.
1452 See <a href="gitattributes.html">gitattributes(5)</a>.
1453 </p>
1454 <div class="paragraph"><p>Each of the attribute requirements for the path takes one of
1455 these forms:</p></div>
1456 <div class="ulist"><ul>
1457 <li>
1458 <p>
1459 "<code>ATTR</code>" requires that the attribute <code>ATTR</code> be set.
1460 </p>
1461 </li>
1462 <li>
1463 <p>
1464 "<code>-ATTR</code>" requires that the attribute <code>ATTR</code> be unset.
1465 </p>
1466 </li>
1467 <li>
1468 <p>
1469 "<code>ATTR=VALUE</code>" requires that the attribute <code>ATTR</code> be
1470   set to the string <code>VALUE</code>.
1471 </p>
1472 </li>
1473 <li>
1474 <p>
1475 "<code>!ATTR</code>" requires that the attribute <code>ATTR</code> be
1476   unspecified.
1477 </p>
1478 <div class="paragraph"><p>Note that when matching against a tree object, attributes are still
1479 obtained from working tree, not from the given tree object.</p></div>
1480 </li>
1481 </ul></div>
1482 </dd>
1483 <dt class="hdlist1">
1484 exclude
1485 </dt>
1486 <dd>
1487 <p>
1488         After a path matches any non-exclude pathspec, it will be run
1489         through all exclude pathspecs (magic signature: <code>!</code> or its
1490         synonym <code>^</code>). If it matches, the path is ignored.  When there
1491         is no non-exclude pathspec, the exclusion is applied to the
1492         result set as if invoked without any pathspec.
1493 </p>
1494 </dd>
1495 </dl></div>
1496 </div></div>
1497 </dd>
1498 <dt class="hdlist1">
1499 <a id="def_parent"></a>parent
1500 </dt>
1501 <dd>
1502 <p>
1503         A <a href="#def_commit_object">commit object</a> contains a (possibly empty) list
1504         of the logical predecessor(s) in the line of development, i.e. its
1505         parents.
1506 </p>
1507 </dd>
1508 <dt class="hdlist1">
1509 <a id="def_pickaxe"></a>pickaxe
1510 </dt>
1511 <dd>
1512 <p>
1513         The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore
1514         routines that help select changes that add or delete a given text
1515         string. With the <code>--pickaxe-all</code> option, it can be used to view the full
1516         <a href="#def_changeset">changeset</a> that introduced or removed, say, a
1517         particular line of text. See <a href="git-diff.html">git-diff(1)</a>.
1518 </p>
1519 </dd>
1520 <dt class="hdlist1">
1521 <a id="def_plumbing"></a>plumbing
1522 </dt>
1523 <dd>
1524 <p>
1525         Cute name for <a href="#def_core_git">core Git</a>.
1526 </p>
1527 </dd>
1528 <dt class="hdlist1">
1529 <a id="def_porcelain"></a>porcelain
1530 </dt>
1531 <dd>
1532 <p>
1533         Cute name for programs and program suites depending on
1534         <a href="#def_core_git">core Git</a>, presenting a high level access to
1535         core Git. Porcelains expose more of a <a href="#def_SCM">SCM</a>
1536         interface than the <a href="#def_plumbing">plumbing</a>.
1537 </p>
1538 </dd>
1539 <dt class="hdlist1">
1540 <a id="def_per_worktree_ref"></a>per-worktree ref
1541 </dt>
1542 <dd>
1543 <p>
1544         Refs that are per-<a href="#def_worktree">worktree</a>, rather than
1545         global.  This is presently only <a href="#def_HEAD">HEAD</a> and any refs
1546         that start with <code>refs/bisect/</code>, but might later include other
1547         unusual refs.
1548 </p>
1549 </dd>
1550 <dt class="hdlist1">
1551 <a id="def_pseudoref"></a>pseudoref
1552 </dt>
1553 <dd>
1554 <p>
1555         Pseudorefs are a class of files under <code>$GIT_DIR</code> which behave
1556         like refs for the purposes of rev-parse, but which are treated
1557         specially by git.  Pseudorefs both have names that are all-caps,
1558         and always start with a line consisting of a
1559         <a href="#def_SHA1">SHA-1</a> followed by whitespace.  So, HEAD is not a
1560         pseudoref, because it is sometimes a symbolic ref.  They might
1561         optionally contain some additional data.  <code>MERGE_HEAD</code> and
1562         <code>CHERRY_PICK_HEAD</code> are examples.  Unlike
1563         <a href="#def_per_worktree_ref">per-worktree refs</a>, these files cannot
1564         be symbolic refs, and never have reflogs.  They also cannot be
1565         updated through the normal ref update machinery.  Instead,
1566         they are updated by directly writing to the files.  However,
1567         they can be read as if they were refs, so <code>git rev-parse
1568         MERGE_HEAD</code> will work.
1569 </p>
1570 </dd>
1571 <dt class="hdlist1">
1572 <a id="def_pull"></a>pull
1573 </dt>
1574 <dd>
1575 <p>
1576         Pulling a <a href="#def_branch">branch</a> means to <a href="#def_fetch">fetch</a> it and
1577         <a href="#def_merge">merge</a> it.  See also <a href="git-pull.html">git-pull(1)</a>.
1578 </p>
1579 </dd>
1580 <dt class="hdlist1">
1581 <a id="def_push"></a>push
1582 </dt>
1583 <dd>
1584 <p>
1585         Pushing a <a href="#def_branch">branch</a> means to get the branch&#8217;s
1586         <a href="#def_head_ref">head ref</a> from a remote <a href="#def_repository">repository</a>,
1587         find out if it is an ancestor to the branch&#8217;s local
1588         head ref, and in that case, putting all
1589         objects, which are <a href="#def_reachable">reachable</a> from the local
1590         head ref, and which are missing from the remote
1591         repository, into the remote
1592         <a href="#def_object_database">object database</a>, and updating the remote
1593         head ref. If the remote <a href="#def_head">head</a> is not an
1594         ancestor to the local head, the push fails.
1595 </p>
1596 </dd>
1597 <dt class="hdlist1">
1598 <a id="def_reachable"></a>reachable
1599 </dt>
1600 <dd>
1601 <p>
1602         All of the ancestors of a given <a href="#def_commit">commit</a> are said to be
1603         "reachable" from that commit. More
1604         generally, one <a href="#def_object">object</a> is reachable from
1605         another if we can reach the one from the other by a <a href="#def_chain">chain</a>
1606         that follows <a href="#def_tag">tags</a> to whatever they tag,
1607         <a href="#def_commit_object">commits</a> to their parents or trees, and
1608         <a href="#def_tree_object">trees</a> to the trees or <a href="#def_blob_object">blobs</a>
1609         that they contain.
1610 </p>
1611 </dd>
1612 <dt class="hdlist1">
1613 <a id="def_reachability_bitmap"></a>reachability bitmaps
1614 </dt>
1615 <dd>
1616 <p>
1617         Reachability bitmaps store information about the
1618         <a href="#def_reachable">reachability</a> of a selected set of commits in
1619         a packfile, or a multi-pack index (MIDX), to speed up object search.
1620         The bitmaps are stored in a ".bitmap" file. A repository may have at
1621         most one bitmap file in use. The bitmap file may belong to either one
1622         pack, or the repository&#8217;s multi-pack index (if it exists).
1623 </p>
1624 </dd>
1625 <dt class="hdlist1">
1626 <a id="def_rebase"></a>rebase
1627 </dt>
1628 <dd>
1629 <p>
1630         To reapply a series of changes from a <a href="#def_branch">branch</a> to a
1631         different base, and reset the <a href="#def_head">head</a> of that branch
1632         to the result.
1633 </p>
1634 </dd>
1635 <dt class="hdlist1">
1636 <a id="def_ref"></a>ref
1637 </dt>
1638 <dd>
1639 <p>
1640         A name that begins with <code>refs/</code> (e.g. <code>refs/heads/master</code>)
1641         that points to an <a href="#def_object_name">object name</a> or another
1642         ref (the latter is called a <a href="#def_symref">symbolic ref</a>).
1643         For convenience, a ref can sometimes be abbreviated when used
1644         as an argument to a Git command; see <a href="gitrevisions.html">gitrevisions(7)</a>
1645         for details.
1646         Refs are stored in the <a href="#def_repository">repository</a>.
1647 </p>
1648 <div class="paragraph"><p>The ref namespace is hierarchical.
1649 Different subhierarchies are used for different purposes (e.g. the
1650 <code>refs/heads/</code> hierarchy is used to represent local branches).</p></div>
1651 <div class="paragraph"><p>There are a few special-purpose refs that do not begin with <code>refs/</code>.
1652 The most notable example is <code>HEAD</code>.</p></div>
1653 </dd>
1654 <dt class="hdlist1">
1655 <a id="def_reflog"></a>reflog
1656 </dt>
1657 <dd>
1658 <p>
1659         A reflog shows the local "history" of a ref.  In other words,
1660         it can tell you what the 3rd last revision in <em>this</em> repository
1661         was, and what was the current state in <em>this</em> repository,
1662         yesterday 9:14pm.  See <a href="git-reflog.html">git-reflog(1)</a> for details.
1663 </p>
1664 </dd>
1665 <dt class="hdlist1">
1666 <a id="def_refspec"></a>refspec
1667 </dt>
1668 <dd>
1669 <p>
1670         A "refspec" is used by <a href="#def_fetch">fetch</a> and
1671         <a href="#def_push">push</a> to describe the mapping between remote
1672         <a href="#def_ref">ref</a> and local ref.
1673 </p>
1674 </dd>
1675 <dt class="hdlist1">
1676 <a id="def_remote"></a>remote repository
1677 </dt>
1678 <dd>
1679 <p>
1680         A <a href="#def_repository">repository</a> which is used to track the same
1681         project but resides somewhere else. To communicate with remotes,
1682         see <a href="#def_fetch">fetch</a> or <a href="#def_push">push</a>.
1683 </p>
1684 </dd>
1685 <dt class="hdlist1">
1686 <a id="def_remote_tracking_branch"></a>remote-tracking branch
1687 </dt>
1688 <dd>
1689 <p>
1690         A <a href="#def_ref">ref</a> that is used to follow changes from another
1691         <a href="#def_repository">repository</a>. It typically looks like
1692         <em>refs/remotes/foo/bar</em> (indicating that it tracks a branch named
1693         <em>bar</em> in a remote named <em>foo</em>), and matches the right-hand-side of
1694         a configured fetch <a href="#def_refspec">refspec</a>. A remote-tracking
1695         branch should not contain direct modifications or have local
1696         commits made to it.
1697 </p>
1698 </dd>
1699 <dt class="hdlist1">
1700 <a id="def_repository"></a>repository
1701 </dt>
1702 <dd>
1703 <p>
1704         A collection of <a href="#def_ref">refs</a> together with an
1705         <a href="#def_object_database">object database</a> containing all objects
1706         which are <a href="#def_reachable">reachable</a> from the refs, possibly
1707         accompanied by meta data from one or more <a href="#def_porcelain">porcelains</a>. A
1708         repository can share an object database with other repositories
1709         via <a href="#def_alternate_object_database">alternates mechanism</a>.
1710 </p>
1711 </dd>
1712 <dt class="hdlist1">
1713 <a id="def_resolve"></a>resolve
1714 </dt>
1715 <dd>
1716 <p>
1717         The action of fixing up manually what a failed automatic
1718         <a href="#def_merge">merge</a> left behind.
1719 </p>
1720 </dd>
1721 <dt class="hdlist1">
1722 <a id="def_revision"></a>revision
1723 </dt>
1724 <dd>
1725 <p>
1726         Synonym for <a href="#def_commit">commit</a> (the noun).
1727 </p>
1728 </dd>
1729 <dt class="hdlist1">
1730 <a id="def_rewind"></a>rewind
1731 </dt>
1732 <dd>
1733 <p>
1734         To throw away part of the development, i.e. to assign the
1735         <a href="#def_head">head</a> to an earlier <a href="#def_revision">revision</a>.
1736 </p>
1737 </dd>
1738 <dt class="hdlist1">
1739 <a id="def_SCM"></a>SCM
1740 </dt>
1741 <dd>
1742 <p>
1743         Source code management (tool).
1744 </p>
1745 </dd>
1746 <dt class="hdlist1">
1747 <a id="def_SHA1"></a>SHA-1
1748 </dt>
1749 <dd>
1750 <p>
1751         "Secure Hash Algorithm 1"; a cryptographic hash function.
1752         In the context of Git used as a synonym for <a href="#def_object_name">object name</a>.
1753 </p>
1754 </dd>
1755 <dt class="hdlist1">
1756 <a id="def_shallow_clone"></a>shallow clone
1757 </dt>
1758 <dd>
1759 <p>
1760         Mostly a synonym to <a href="#def_shallow_repository">shallow repository</a>
1761         but the phrase makes it more explicit that it was created by
1762         running <code>git clone --depth=...</code> command.
1763 </p>
1764 </dd>
1765 <dt class="hdlist1">
1766 <a id="def_shallow_repository"></a>shallow repository
1767 </dt>
1768 <dd>
1769 <p>
1770         A shallow <a href="#def_repository">repository</a> has an incomplete
1771         history some of whose <a href="#def_commit">commits</a> have <a href="#def_parent">parents</a> cauterized away (in other
1772         words, Git is told to pretend that these commits do not have the
1773         parents, even though they are recorded in the <a href="#def_commit_object">commit         object</a>). This is sometimes useful when you are interested only in the
1774         recent history of a project even though the real history recorded in the
1775         upstream is much larger. A shallow repository
1776         is created by giving the <code>--depth</code> option to <a href="git-clone.html">git-clone(1)</a>, and
1777         its history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>.
1778 </p>
1779 </dd>
1780 <dt class="hdlist1">
1781 <a id="def_stash"></a>stash entry
1782 </dt>
1783 <dd>
1784 <p>
1785         An <a href="#def_object">object</a> used to temporarily store the contents of a
1786         <a href="#def_dirty">dirty</a> working directory and the index for future reuse.
1787 </p>
1788 </dd>
1789 <dt class="hdlist1">
1790 <a id="def_submodule"></a>submodule
1791 </dt>
1792 <dd>
1793 <p>
1794         A <a href="#def_repository">repository</a> that holds the history of a
1795         separate project inside another repository (the latter of
1796         which is called <a href="#def_superproject">superproject</a>).
1797 </p>
1798 </dd>
1799 <dt class="hdlist1">
1800 <a id="def_superproject"></a>superproject
1801 </dt>
1802 <dd>
1803 <p>
1804         A <a href="#def_repository">repository</a> that references repositories
1805         of other projects in its working tree as <a href="#def_submodule">submodules</a>.
1806         The superproject knows about the names of (but does not hold
1807         copies of) commit objects of the contained submodules.
1808 </p>
1809 </dd>
1810 <dt class="hdlist1">
1811 <a id="def_symref"></a>symref
1812 </dt>
1813 <dd>
1814 <p>
1815         Symbolic reference: instead of containing the <a href="#def_SHA1">SHA-1</a>
1816         id itself, it is of the format <em>ref: refs/some/thing</em> and when
1817         referenced, it recursively dereferences to this reference.
1818         <em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic
1819         references are manipulated with the <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>
1820         command.
1821 </p>
1822 </dd>
1823 <dt class="hdlist1">
1824 <a id="def_tag"></a>tag
1825 </dt>
1826 <dd>
1827 <p>
1828         A <a href="#def_ref">ref</a> under <code>refs/tags/</code> namespace that points to an
1829         object of an arbitrary type (typically a tag points to either a
1830         <a href="#def_tag_object">tag</a> or a <a href="#def_commit_object">commit object</a>).
1831         In contrast to a <a href="#def_head">head</a>, a tag is not updated by
1832         the <code>commit</code> command. A Git tag has nothing to do with a Lisp
1833         tag (which would be called an <a href="#def_object_type">object type</a>
1834         in Git&#8217;s context). A tag is most typically used to mark a particular
1835         point in the commit ancestry <a href="#def_chain">chain</a>.
1836 </p>
1837 </dd>
1838 <dt class="hdlist1">
1839 <a id="def_tag_object"></a>tag object
1840 </dt>
1841 <dd>
1842 <p>
1843         An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to
1844         another object, which can contain a message just like a
1845         <a href="#def_commit_object">commit object</a>. It can also contain a (PGP)
1846         signature, in which case it is called a "signed tag object".
1847 </p>
1848 </dd>
1849 <dt class="hdlist1">
1850 <a id="def_topic_branch"></a>topic branch
1851 </dt>
1852 <dd>
1853 <p>
1854         A regular Git <a href="#def_branch">branch</a> that is used by a developer to
1855         identify a conceptual line of development. Since branches are very easy
1856         and inexpensive, it is often desirable to have several small branches
1857         that each contain very well defined concepts or small incremental yet
1858         related changes.
1859 </p>
1860 </dd>
1861 <dt class="hdlist1">
1862 <a id="def_tree"></a>tree
1863 </dt>
1864 <dd>
1865 <p>
1866         Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree         object</a> together with the dependent <a href="#def_blob_object">blob</a> and tree objects
1867         (i.e. a stored representation of a working tree).
1868 </p>
1869 </dd>
1870 <dt class="hdlist1">
1871 <a id="def_tree_object"></a>tree object
1872 </dt>
1873 <dd>
1874 <p>
1875         An <a href="#def_object">object</a> containing a list of file names and modes along
1876         with refs to the associated blob and/or tree objects. A
1877         <a href="#def_tree">tree</a> is equivalent to a <a href="#def_directory">directory</a>.
1878 </p>
1879 </dd>
1880 <dt class="hdlist1">
1881 <a id="def_tree-ish"></a>tree-ish (also treeish)
1882 </dt>
1883 <dd>
1884 <p>
1885         A <a href="#def_tree_object">tree object</a> or an <a href="#def_object">object</a>
1886         that can be recursively dereferenced to a tree object.
1887         Dereferencing a <a href="#def_commit_object">commit object</a> yields the
1888         tree object corresponding to the <a href="#def_revision">revision</a>'s
1889         top <a href="#def_directory">directory</a>.
1890         The following are all tree-ishes:
1891         a <a href="#def_commit-ish">commit-ish</a>,
1892         a tree object,
1893         a <a href="#def_tag_object">tag object</a> that points to a tree object,
1894         a tag object that points to a tag object that points to a tree
1895         object,
1896         etc.
1897 </p>
1898 </dd>
1899 <dt class="hdlist1">
1900 <a id="def_unmerged_index"></a>unmerged index
1901 </dt>
1902 <dd>
1903 <p>
1904         An <a href="#def_index">index</a> which contains unmerged
1905         <a href="#def_index_entry">index entries</a>.
1906 </p>
1907 </dd>
1908 <dt class="hdlist1">
1909 <a id="def_unreachable_object"></a>unreachable object
1910 </dt>
1911 <dd>
1912 <p>
1913         An <a href="#def_object">object</a> which is not <a href="#def_reachable">reachable</a> from a
1914         <a href="#def_branch">branch</a>, <a href="#def_tag">tag</a>, or any other reference.
1915 </p>
1916 </dd>
1917 <dt class="hdlist1">
1918 <a id="def_upstream_branch"></a>upstream branch
1919 </dt>
1920 <dd>
1921 <p>
1922         The default <a href="#def_branch">branch</a> that is merged into the branch in
1923         question (or the branch in question is rebased onto). It is configured
1924         via branch.&lt;name&gt;.remote and branch.&lt;name&gt;.merge. If the upstream branch
1925         of <em>A</em> is <em>origin/B</em> sometimes we say "<em>A</em> is tracking <em>origin/B</em>".
1926 </p>
1927 </dd>
1928 <dt class="hdlist1">
1929 <a id="def_working_tree"></a>working tree
1930 </dt>
1931 <dd>
1932 <p>
1933         The tree of actual checked out files.  The working tree normally
1934         contains the contents of the <a href="#def_HEAD">HEAD</a> commit&#8217;s tree,
1935         plus any local changes that you have made but not yet committed.
1936 </p>
1937 </dd>
1938 <dt class="hdlist1">
1939 <a id="def_worktree"></a>worktree
1940 </dt>
1941 <dd>
1942 <p>
1943         A repository can have zero (i.e. bare repository) or one or
1944         more worktrees attached to it. One "worktree" consists of a
1945         "working tree" and repository metadata, most of which are
1946         shared among other worktrees of a single repository, and
1947         some of which are maintained separately per worktree
1948         (e.g. the index, HEAD and pseudorefs like MERGE_HEAD,
1949         per-worktree refs and per-worktree configuration file).
1950 </p>
1951 </dd>
1952 </dl></div>
1953 </div>
1954 </div>
1955 <div class="sect1">
1956 <h2 id="_see_also">SEE ALSO</h2>
1957 <div class="sectionbody">
1958 <div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>,
1959 <a href="gittutorial-2.html">gittutorial-2(7)</a>,
1960 <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,
1961 <a href="giteveryday.html">giteveryday(7)</a>,
1962 <a href="user-manual.html">The Git User&#8217;s Manual</a></p></div>
1963 </div>
1964 </div>
1965 <div class="sect1">
1966 <h2 id="_git">GIT</h2>
1967 <div class="sectionbody">
1968 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1969 </div>
1970 </div>
1971 </div>
1972 <div id="footnotes"><hr /></div>
1973 <div id="footer">
1974 <div id="footer-text">
1975 Last updated
1976  2020-03-11 07:02:33 JST
1977 </div>
1978 </div>
1979 </body>
1980 </html>