/usr/share/doc/git-doc/gitglossary.html is in git-doc 1:1.7.9.5-1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.6" />
<title>gitglossary(7)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
/* Default font. */
body {
font-family: Georgia,serif;
}
/* Title font. */
h1, h2, h3, h4, h5, h6,
div.title, caption.title,
thead, p.table.header,
#toctitle,
#author, #revnumber, #revdate, #revremark,
#footer {
font-family: Arial,Helvetica,sans-serif;
}
body {
margin: 1em 5% 1em 5%;
}
a {
color: blue;
text-decoration: underline;
}
a:visited {
color: fuchsia;
}
em {
font-style: italic;
color: navy;
}
strong {
font-weight: bold;
color: #083194;
}
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
}
h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
padding-top: 0.5em;
}
h3 {
float: left;
}
h3 + * {
clear: left;
}
h5 {
font-size: 1.0em;
}
div.sectionbody {
margin-left: 0;
}
hr {
border: 1px solid silver;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
ul, ol, li > p {
margin-top: 0;
}
ul > li { color: #aaa; }
ul > li > * { color: black; }
pre {
padding: 0;
margin: 0;
}
#author {
color: #527bbd;
font-weight: bold;
font-size: 1.1em;
}
#email {
}
#revnumber, #revdate, #revremark {
}
#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
#footer-text {
float: left;
padding-bottom: 0.5em;
}
#footer-badges {
float: right;
padding-bottom: 0.5em;
}
#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
div.admonitionblock {
margin-top: 2.0em;
margin-bottom: 2.0em;
margin-right: 10%;
color: #606060;
}
div.content { /* Block element content. */
padding: 0;
}
/* Block element titles. */
div.title, caption.title {
color: #527bbd;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
}
div.title + * {
margin-top: 0;
}
td div.title:first-child {
margin-top: 0.0em;
}
div.content div.title:first-child {
margin-top: 0.0em;
}
div.content + div.title {
margin-top: 0.0em;
}
div.sidebarblock > div.content {
background: #ffffee;
border: 1px solid #dddddd;
border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
border: 1px solid #dddddd;
border-left: 5px solid #f0f0f0;
background: #f8f8f8;
padding: 0.5em;
}
div.quoteblock, div.verseblock {
padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
border-left: 5px solid #f0f0f0;
color: #888;
}
div.quoteblock > div.attribution {
padding-top: 0.5em;
text-align: right;
}
div.verseblock > pre.content {
font-family: inherit;
font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
div.admonitionblock .icon {
vertical-align: top;
font-size: 1.1em;
font-weight: bold;
text-decoration: underline;
color: #527bbd;
padding-right: 0.5em;
}
div.admonitionblock td.content {
padding-left: 0.5em;
border-left: 3px solid #dddddd;
}
div.exampleblock > div.content {
border-left: 3px solid #dddddd;
padding-left: 0.5em;
}
div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; }
a.image:visited { color: white; }
dl {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
dt {
margin-top: 0.5em;
margin-bottom: 0;
font-style: normal;
color: navy;
}
dd > *:first-child {
margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
ol.arabic {
list-style-type: decimal;
}
ol.loweralpha {
list-style-type: lower-alpha;
}
ol.upperalpha {
list-style-type: upper-alpha;
}
ol.lowerroman {
list-style-type: lower-roman;
}
ol.upperroman {
list-style-type: upper-roman;
}
div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
margin-top: 0.1em;
margin-bottom: 0.1em;
}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
div.hdlist tr {
padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
font-weight: bold;
}
td.hdlist1 {
vertical-align: top;
font-style: normal;
padding-right: 0.8em;
color: navy;
}
td.hdlist2 {
vertical-align: top;
}
div.hdlist.compact tr {
margin: 0;
padding-bottom: 0;
}
.comment {
background: yellow;
}
.footnote, .footnoteref {
font-size: 0.8em;
}
span.footnote, span.footnoteref {
vertical-align: super;
}
#footnotes {
margin: 20px 0 20px 0;
padding: 7px 0 0 0;
}
#footnotes div.footnote {
margin: 0 0 5px 0;
}
#footnotes hr {
border: none;
border-top: 1px solid silver;
height: 1px;
text-align: left;
margin-left: 0;
width: 20%;
min-width: 100px;
}
div.colist td {
padding-right: 0.5em;
padding-bottom: 0.3em;
vertical-align: top;
}
div.colist td img {
margin-top: 0.3em;
}
@media print {
#footer-badges { display: none; }
}
#toc {
margin-bottom: 2.5em;
}
#toctitle {
color: #527bbd;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
div.toclevel2 {
margin-left: 2em;
font-size: 0.9em;
}
div.toclevel3 {
margin-left: 4em;
font-size: 0.9em;
}
div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
span.aqua { color: aqua; }
span.black { color: black; }
span.blue { color: blue; }
span.fuchsia { color: fuchsia; }
span.gray { color: gray; }
span.green { color: green; }
span.lime { color: lime; }
span.maroon { color: maroon; }
span.navy { color: navy; }
span.olive { color: olive; }
span.purple { color: purple; }
span.red { color: red; }
span.silver { color: silver; }
span.teal { color: teal; }
span.white { color: white; }
span.yellow { color: yellow; }
span.aqua-background { background: aqua; }
span.black-background { background: black; }
span.blue-background { background: blue; }
span.fuchsia-background { background: fuchsia; }
span.gray-background { background: gray; }
span.green-background { background: green; }
span.lime-background { background: lime; }
span.maroon-background { background: maroon; }
span.navy-background { background: navy; }
span.olive-background { background: olive; }
span.purple-background { background: purple; }
span.red-background { background: red; }
span.silver-background { background: silver; }
span.teal-background { background: teal; }
span.white-background { background: white; }
span.yellow-background { background: yellow; }
span.big { font-size: 2em; }
span.small { font-size: 0.6em; }
span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
/*
* xhtml11 specific
*
* */
tt {
font-family: monospace;
font-size: inherit;
color: navy;
}
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
div.tableblock > table {
border: 3px solid #527bbd;
}
thead, p.table.header {
font-weight: bold;
color: #527bbd;
}
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
div.tableblock > table[frame="hsides"] {
border-left-style: none;
border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
border-top-style: none;
border-bottom-style: none;
}
/*
* html5 specific
*
* */
.monospaced {
font-family: monospace;
font-size: inherit;
color: navy;
}
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
thead, p.tableblock.header {
font-weight: bold;
color: #527bbd;
}
p.tableblock {
margin-top: 0;
}
table.tableblock {
border-width: 3px;
border-spacing: 0px;
border-style: solid;
border-color: #527bbd;
border-collapse: collapse;
}
th.tableblock, td.tableblock {
border-width: 1px;
padding: 4px;
border-style: solid;
border-color: #527bbd;
}
table.tableblock.frame-topbot {
border-left-style: hidden;
border-right-style: hidden;
}
table.tableblock.frame-sides {
border-top-style: hidden;
border-bottom-style: hidden;
}
table.tableblock.frame-none {
border-style: hidden;
}
th.tableblock.halign-left, td.tableblock.halign-left {
text-align: left;
}
th.tableblock.halign-center, td.tableblock.halign-center {
text-align: center;
}
th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
th.tableblock.valign-top, td.tableblock.valign-top {
vertical-align: top;
}
th.tableblock.valign-middle, td.tableblock.valign-middle {
vertical-align: middle;
}
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
vertical-align: bottom;
}
/*
* manpage specific
*
* */
body.manpage h1 {
padding-top: 0.5em;
padding-bottom: 0.5em;
border-top: 2px solid silver;
border-bottom: 2px solid silver;
}
body.manpage h2 {
border-style: none;
}
body.manpage div.sectionbody {
margin-left: 3em;
}
@media print {
body.manpage div#toc { display: none; }
}
</style>
<script type="text/javascript">
/*<![CDATA[*/
var asciidoc = { // Namespace.
/////////////////////////////////////////////////////////////////////
// Table Of Contents generator
/////////////////////////////////////////////////////////////////////
/* Author: Mihai Bazon, September 2002
* http://students.infoiasi.ro/~mishoo
*
* Table Of Content generator
* Version: 0.4
*
* Feel free to use this script under the terms of the GNU General Public
* License, as long as you do not remove or alter this notice.
*/
/* modified by Troy D. Hanson, September 2006. License: GPL */
/* modified by Stuart Rackham, 2006, 2009. License: GPL */
// toclevels = 1..4.
toc: function (toclevels) {
function getText(el) {
var text = "";
for (var i = el.firstChild; i != null; i = i.nextSibling) {
if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
text += i.data;
else if (i.firstChild != null)
text += getText(i);
}
return text;
}
function TocEntry(el, text, toclevel) {
this.element = el;
this.text = text;
this.toclevel = toclevel;
}
function tocEntries(el, toclevels) {
var result = new Array;
var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
var iterate = function (el) {
for (var i = el.firstChild; i != null; i = i.nextSibling) {
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
var mo = re.exec(i.tagName);
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
}
iterate(i);
}
}
}
iterate(el);
return result;
}
var toc = document.getElementById("toc");
if (!toc) {
return;
}
// Delete existing TOC entries in case we're reloading the TOC.
var tocEntriesToRemove = [];
var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
if (entry.nodeName == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
}
for (i = 0; i < tocEntriesToRemove.length; i++) {
toc.removeChild(tocEntriesToRemove[i]);
}
// Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
if (entry.element.id == "")
entry.element.id = "_toc_" + i;
var a = document.createElement("a");
a.href = "#" + entry.element.id;
a.appendChild(document.createTextNode(entry.text));
var div = document.createElement("div");
div.appendChild(a);
div.className = "toclevel" + entry.toclevel;
toc.appendChild(div);
}
if (entries.length == 0)
toc.parentNode.removeChild(toc);
},
/////////////////////////////////////////////////////////////////////
// Footnotes generator
/////////////////////////////////////////////////////////////////////
/* Based on footnote generation code from:
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
*/
footnotes: function () {
// Delete existing footnote entries in case we're reloading the footnodes.
var i;
var noteholder = document.getElementById("footnotes");
if (!noteholder) {
return;
}
var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
noteholder.removeChild(entriesToRemove[i]);
}
// Rebuild footnote entries.
var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
var note = spans[i].getAttribute("data-note");
if (!note) {
// Use [\s\S] in place of . so multi-line matches work.
// Because JavaScript has no s (dotall) regex flag.
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
spans[i].innerHTML =
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
"' title='View footnote' class='footnote'>" + n + "</a>]";
spans[i].setAttribute("data-note", note);
}
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
}
if (n == 0)
noteholder.parentNode.removeChild(noteholder);
else {
// Process footnoterefs.
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnoteref") {
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
href = href.match(/#.*/)[0]; // Because IE return full URL.
n = refs[href];
spans[i].innerHTML =
"[<a href='#_footnote_" + n +
"' title='View footnote' class='footnote'>" + n + "</a>]";
}
}
}
},
install: function(toclevels) {
var timerId;
function reinstall() {
asciidoc.footnotes();
if (toclevels) {
asciidoc.toc(toclevels);
}
}
function reinstallAndRemoveTimer() {
clearInterval(timerId);
reinstall();
}
timerId = setInterval(reinstall, 500);
if (document.addEventListener)
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
else
window.onload = reinstallAndRemoveTimer;
}
}
asciidoc.install();
/*]]>*/
</script>
</head>
<body class="manpage">
<div id="header">
<h1>
gitglossary(7) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>gitglossary -
A GIT Glossary
</p>
</div>
</div>
<div id="content">
<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="paragraph"><p>*</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
<a id="def_alternate_object_database"></a>alternate object database
</dt>
<dd>
<p>
Via the alternates mechanism, a <a href="#def_repository">repository</a>
can inherit part of its <a href="#def_object_database">object database</a>
from another object database, which is called "alternate".
</p>
</dd>
<dt class="hdlist1">
<a id="def_bare_repository"></a>bare repository
</dt>
<dd>
<p>
A bare repository is normally an appropriately
named <a href="#def_directory">directory</a> with a <tt>.git</tt> suffix that does not
have a locally checked-out copy of any of the files under
revision control. That is, all of the <tt>git</tt>
administrative and control files that would normally be present in the
hidden <tt>.git</tt> sub-directory are directly present in the
<tt>repository.git</tt> directory instead,
and no other files are present and checked out. Usually publishers of
public repositories make bare repositories available.
</p>
</dd>
<dt class="hdlist1">
<a id="def_blob_object"></a>blob object
</dt>
<dd>
<p>
Untyped <a href="#def_object">object</a>, e.g. the contents of a file.
</p>
</dd>
<dt class="hdlist1">
<a id="def_branch"></a>branch
</dt>
<dd>
<p>
A "branch" is an active line of development. The most recent
<a href="#def_commit">commit</a> on a branch is referred to as the tip of
that branch. The tip of the branch is referenced by a branch
<a href="#def_head">head</a>, which moves forward as additional development
is done on the branch. A single git
<a href="#def_repository">repository</a> can track an arbitrary number of
branches, but your <a href="#def_working_tree">working tree</a> is
associated with just one of them (the "current" or "checked out"
branch), and <a href="#def_HEAD">HEAD</a> points to that branch.
</p>
</dd>
<dt class="hdlist1">
<a id="def_cache"></a>cache
</dt>
<dd>
<p>
Obsolete for: <a href="#def_index">index</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_chain"></a>chain
</dt>
<dd>
<p>
A list of objects, where each <a href="#def_object">object</a> in the list contains
a reference to its successor (for example, the successor of a
<a href="#def_commit">commit</a> could be one of its <a href="#def_parent">parents</a>).
</p>
</dd>
<dt class="hdlist1">
<a id="def_changeset"></a>changeset
</dt>
<dd>
<p>
BitKeeper/cvsps speak for "<a href="#def_commit">commit</a>". Since git does not
store changes, but states, it really does not make sense to use the term
"changesets" with git.
</p>
</dd>
<dt class="hdlist1">
<a id="def_checkout"></a>checkout
</dt>
<dd>
<p>
The action of updating all or part of the
<a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a>
or <a href="#def_blob_object">blob</a> from the
<a href="#def_object_database">object database</a>, and updating the
<a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has
been pointed at a new <a href="#def_branch">branch</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_cherry-picking"></a>cherry-picking
</dt>
<dd>
<p>
In <a href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of
changes out of a series of changes (typically commits) and record them
as a new series of changes on top of a different codebase. In GIT, this is
performed by the "git cherry-pick" command to extract the change introduced
by an existing <a href="#def_commit">commit</a> and to record it based on the tip
of the current <a href="#def_branch">branch</a> as a new commit.
</p>
</dd>
<dt class="hdlist1">
<a id="def_clean"></a>clean
</dt>
<dd>
<p>
A <a href="#def_working_tree">working tree</a> is clean, if it
corresponds to the <a href="#def_revision">revision</a> referenced by the current
<a href="#def_head">head</a>. Also see "<a href="#def_dirty">dirty</a>".
</p>
</dd>
<dt class="hdlist1">
<a id="def_commit"></a>commit
</dt>
<dd>
<p>
As a noun: A single point in the
git history; the entire history of a project is represented as a
set of interrelated commits. The word "commit" is often
used by git in the same places other revision control systems
use the words "revision" or "version". Also used as a short
hand for <a href="#def_commit_object">commit object</a>.
</p>
<div class="paragraph"><p>As a verb: The action of storing a new snapshot of the project’s
state in the git history, by creating a new commit representing the current
state of the <a href="#def_index">index</a> and advancing <a href="#def_HEAD">HEAD</a>
to point at the new commit.</p></div>
</dd>
<dt class="hdlist1">
<a id="def_commit_object"></a>commit object
</dt>
<dd>
<p>
An <a href="#def_object">object</a> which contains the information about a
particular <a href="#def_revision">revision</a>, such as <a href="#def_parent">parents</a>, committer,
author, date and the <a href="#def_tree_object">tree object</a> which corresponds
to the top <a href="#def_directory">directory</a> of the stored
revision.
</p>
</dd>
<dt class="hdlist1">
<a id="def_core_git"></a>core git
</dt>
<dd>
<p>
Fundamental data structures and utilities of git. Exposes only limited
source code management tools.
</p>
</dd>
<dt class="hdlist1">
<a id="def_DAG"></a>DAG
</dt>
<dd>
<p>
Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a
directed acyclic graph, because they have parents (directed), and the
graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a>
which begins and ends with the same <a href="#def_object">object</a>).
</p>
</dd>
<dt class="hdlist1">
<a id="def_dangling_object"></a>dangling object
</dt>
<dd>
<p>
An <a href="#def_unreachable_object">unreachable object</a> which is not
<a href="#def_reachable">reachable</a> even from other unreachable objects; a
dangling object has no references to it from any
reference or <a href="#def_object">object</a> in the <a href="#def_repository">repository</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_detached_HEAD"></a>detached HEAD
</dt>
<dd>
<p>
Normally the <a href="#def_HEAD">HEAD</a> stores the name of a
<a href="#def_branch">branch</a>. However, git also allows you to <a href="#def_checkout">check out</a>
an arbitrary <a href="#def_commit">commit</a> that isn’t necessarily the tip of any
particular branch. In this case HEAD is said to be "detached".
</p>
</dd>
<dt class="hdlist1">
<a id="def_dircache"></a>dircache
</dt>
<dd>
<p>
You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_directory"></a>directory
</dt>
<dd>
<p>
The list you get with "ls" :-)
</p>
</dd>
<dt class="hdlist1">
<a id="def_dirty"></a>dirty
</dt>
<dd>
<p>
A <a href="#def_working_tree">working tree</a> is said to be "dirty" if
it contains modifications which have not been <a href="#def_commit">committed</a> to the current
<a href="#def_branch">branch</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_ent"></a>ent
</dt>
<dd>
<p>
Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See
<tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)</tt> for an in-depth
explanation. Avoid this term, not to confuse people.
</p>
</dd>
<dt class="hdlist1">
<a id="def_evil_merge"></a>evil merge
</dt>
<dd>
<p>
An evil merge is a <a href="#def_merge">merge</a> that introduces changes that
do not appear in any <a href="#def_parent">parent</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_fast_forward"></a>fast-forward
</dt>
<dd>
<p>
A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a
<a href="#def_revision">revision</a> and you are "merging" another
<a href="#def_branch">branch</a>'s changes that happen to be a descendant of what
you have. In such these cases, you do not make a new <a href="#def_merge">merge</a>
<a href="#def_commit">commit</a> but instead just update to his
revision. This will happen frequently on a
<a href="#def_remote_tracking_branch">remote-tracking branch</a> of a remote
<a href="#def_repository">repository</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_fetch"></a>fetch
</dt>
<dd>
<p>
Fetching a <a href="#def_branch">branch</a> means to get the
branch’s <a href="#def_head_ref">head ref</a> from a remote
<a href="#def_repository">repository</a>, to find out which objects are
missing from the local <a href="#def_object_database">object database</a>,
and to get them, too. See also <a href="git-fetch.html">git-fetch(1)</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_file_system"></a>file system
</dt>
<dd>
<p>
Linus Torvalds originally designed git to be a user space file system,
i.e. the infrastructure to hold files and directories. That ensured the
efficiency and speed of git.
</p>
</dd>
<dt class="hdlist1">
<a id="def_git_archive"></a>git archive
</dt>
<dd>
<p>
Synonym for <a href="#def_repository">repository</a> (for arch people).
</p>
</dd>
<dt class="hdlist1">
<a id="def_grafts"></a>grafts
</dt>
<dd>
<p>
Grafts enables two otherwise different lines of development to be joined
together by recording fake ancestry information for commits. This way
you can make git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has
is different from what was recorded when the commit was
created. Configured via the <tt>.git/info/grafts</tt> file.
</p>
</dd>
<dt class="hdlist1">
<a id="def_hash"></a>hash
</dt>
<dd>
<p>
In git’s context, synonym to <a href="#def_object_name">object name</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_head"></a>head
</dt>
<dd>
<p>
A <a href="#def_ref">named reference</a> to the <a href="#def_commit">commit</a> at the tip of a
<a href="#def_branch">branch</a>. Heads are stored in a file in
<tt>$GIT_DIR/refs/heads/</tt> directory, except when using packed refs. (See
<a href="git-pack-refs.html">git-pack-refs(1)</a>.)
</p>
</dd>
<dt class="hdlist1">
<a id="def_HEAD"></a>HEAD
</dt>
<dd>
<p>
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
referred to by HEAD. HEAD is a reference to one of the
<a href="#def_head">heads</a> in your repository, except when using a
<a href="#def_detached_HEAD">detached HEAD</a>, in which case it directly
references an arbitrary commit.
</p>
</dd>
<dt class="hdlist1">
<a id="def_head_ref"></a>head ref
</dt>
<dd>
<p>
A synonym for <a href="#def_head">head</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_hook"></a>hook
</dt>
<dd>
<p>
During the normal execution of several git commands, call-outs are made
to optional scripts that allow a developer to add functionality or
checking. Typically, the hooks allow for a command to be pre-verified
and potentially aborted, and allow for a post-notification after the
operation is done. The hook scripts are found in the
<tt>$GIT_DIR/hooks/</tt> directory, and are enabled by simply
removing the <tt>.sample</tt> suffix from the filename. In earlier versions
of git you had to make them executable.
</p>
</dd>
<dt class="hdlist1">
<a id="def_index"></a>index
</dt>
<dd>
<p>
A collection of files with stat information, whose contents are stored
as objects. The index is a stored version of your
<a href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even
a third version of a working tree, which are used
when <a href="#def_merge">merging</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_index_entry"></a>index entry
</dt>
<dd>
<p>
The information regarding a particular file, stored in the
<a href="#def_index">index</a>. An index entry can be unmerged, if a
<a href="#def_merge">merge</a> was started, but not yet finished (i.e. if
the index contains multiple versions of that file).
</p>
</dd>
<dt class="hdlist1">
<a id="def_master"></a>master
</dt>
<dd>
<p>
The default development <a href="#def_branch">branch</a>. Whenever you
create a git <a href="#def_repository">repository</a>, a branch named
"master" is created, and becomes the active branch. In most
cases, this contains the local development, though that is
purely by convention and is not required.
</p>
</dd>
<dt class="hdlist1">
<a id="def_merge"></a>merge
</dt>
<dd>
<p>
As a verb: To bring the contents of another
<a href="#def_branch">branch</a> (possibly from an external
<a href="#def_repository">repository</a>) into the current branch. In the
case where the merged-in branch is from a different repository,
this is done by first <a href="#def_fetch">fetching</a> the remote branch
and then merging the result into the current branch. This
combination of fetch and merge operations is called a
<a href="#def_pull">pull</a>. Merging is performed by an automatic process
that identifies changes made since the branches diverged, and
then applies all those changes together. In cases where changes
conflict, manual intervention may be required to complete the
merge.
</p>
<div class="paragraph"><p>As a noun: unless it is a <a href="#def_fast_forward">fast-forward</a>, a
successful merge results in the creation of a new <a href="#def_commit">commit</a>
representing the result of the merge, and having as
<a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>.
This commit is referred to as a "merge commit", or sometimes just a
"merge".</p></div>
</dd>
<dt class="hdlist1">
<a id="def_object"></a>object
</dt>
<dd>
<p>
The unit of storage in git. It is uniquely identified by the
<a href="#def_SHA1">SHA1</a> of its contents. Consequently, an
object can not be changed.
</p>
</dd>
<dt class="hdlist1">
<a id="def_object_database"></a>object database
</dt>
<dd>
<p>
Stores a set of "objects", and an individual <a href="#def_object">object</a> is
identified by its <a href="#def_object_name">object name</a>. The objects usually
live in <tt>$GIT_DIR/objects/</tt>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_object_identifier"></a>object identifier
</dt>
<dd>
<p>
Synonym for <a href="#def_object_name">object name</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_object_name"></a>object name
</dt>
<dd>
<p>
The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>
of the object’s contents using the Secure Hash Algorithm
1 and usually represented by the 40 character hexadecimal encoding of
the <a href="#def_hash">hash</a> of the object.
</p>
</dd>
<dt class="hdlist1">
<a id="def_object_type"></a>object type
</dt>
<dd>
<p>
One of the identifiers "<a href="#def_commit_object">commit</a>",
"<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or
"<a href="#def_blob_object">blob</a>" describing the type of an
<a href="#def_object">object</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_octopus"></a>octopus
</dt>
<dd>
<p>
To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an
intelligent predator.
</p>
</dd>
<dt class="hdlist1">
<a id="def_origin"></a>origin
</dt>
<dd>
<p>
The default upstream <a href="#def_repository">repository</a>. Most projects have
at least one upstream project which they track. By default
<em>origin</em> is used for that purpose. New upstream updates
will be fetched into remote <a href="#def_remote_tracking_branch">remote-tracking branches</a> named
origin/name-of-upstream-branch, which you can see using
<tt>git branch -r</tt>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_pack"></a>pack
</dt>
<dd>
<p>
A set of objects which have been compressed into one file (to save space
or to transmit them efficiently).
</p>
</dd>
<dt class="hdlist1">
<a id="def_pack_index"></a>pack index
</dt>
<dd>
<p>
The list of identifiers, and other information, of the objects in a
<a href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a
pack.
</p>
</dd>
<dt class="hdlist1">
<a id="def_pathspec"></a>pathspec
</dt>
<dd>
<p>
Pattern used to specify paths.
</p>
<div class="paragraph"><p>Pathspecs are used on the command line of "git ls-files", "git
ls-tree", "git add", "git grep", "git diff", "git checkout",
and many other commands to
limit the scope of operations to some subset of the tree or
worktree. See the documentation of each command for whether
paths are relative to the current directory or toplevel. The
pathspec syntax is as follows:</p></div>
<div class="ulist"><ul>
<li>
<p>
any path matches itself
</p>
</li>
<li>
<p>
the pathspec up to the last slash represents a
directory prefix. The scope of that pathspec is
limited to that subtree.
</p>
</li>
<li>
<p>
the rest of the pathspec is a pattern for the remainder
of the pathname. Paths relative to the directory
prefix will be matched against that pattern using fnmatch(3);
in particular, <em>*</em> and <em>?</em> <em>can</em> match directory separators.
</p>
<div class="paragraph"><p>For example, Documentation/*.jpg will match all .jpg files
in the Documentation subtree,
including Documentation/chapter_1/figure_1.jpg.</p></div>
</li>
</ul></div>
<div class="paragraph"><p>A pathspec that begins with a colon <tt>:</tt> has special meaning. In the
short form, the leading colon <tt>:</tt> is followed by zero or more "magic
signature" letters (which optionally is terminated by another colon <tt>:</tt>),
and the remainder is the pattern to match against the path. The optional
colon that terminates the "magic signature" can be omitted if the pattern
begins with a character that cannot be a "magic signature" and is not a
colon.</p></div>
<div class="paragraph"><p>In the long form, the leading colon <tt>:</tt> is followed by a open
parenthesis <tt>(</tt>, a comma-separated list of zero or more "magic words",
and a close parentheses <tt>)</tt>, and the remainder is the pattern to match
against the path.</p></div>
<div class="paragraph"><p>The "magic signature" consists of an ASCII symbol that is not
alphanumeric.</p></div>
<div class="openblock">
<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
top <tt>/</tt>
</dt>
<dd>
<p>
The magic word <tt>top</tt> (mnemonic: <tt>/</tt>) makes the pattern match
from the root of the working tree, even when you are running
the command from inside a subdirectory.
</p>
</dd>
</dl></div>
</div></div>
<div class="paragraph"><p>Currently only the slash <tt>/</tt> is recognized as the "magic signature",
but it is envisioned that we will support more types of magic in later
versions of git.</p></div>
<div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form
should not be combined with other pathspec.</p></div>
</dd>
<dt class="hdlist1">
<a id="def_parent"></a>parent
</dt>
<dd>
<p>
A <a href="#def_commit_object">commit object</a> contains a (possibly empty) list
of the logical predecessor(s) in the line of development, i.e. its
parents.
</p>
</dd>
<dt class="hdlist1">
<a id="def_pickaxe"></a>pickaxe
</dt>
<dd>
<p>
The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore
routines that help select changes that add or delete a given text
string. With the <tt>--pickaxe-all</tt> option, it can be used to view the full
<a href="#def_changeset">changeset</a> that introduced or removed, say, a
particular line of text. See <a href="git-diff.html">git-diff(1)</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_plumbing"></a>plumbing
</dt>
<dd>
<p>
Cute name for <a href="#def_core_git">core git</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_porcelain"></a>porcelain
</dt>
<dd>
<p>
Cute name for programs and program suites depending on
<a href="#def_core_git">core git</a>, presenting a high level access to
core git. Porcelains expose more of a <a href="#def_SCM">SCM</a>
interface than the <a href="#def_plumbing">plumbing</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_pull"></a>pull
</dt>
<dd>
<p>
Pulling a <a href="#def_branch">branch</a> means to <a href="#def_fetch">fetch</a> it and
<a href="#def_merge">merge</a> it. See also <a href="git-pull.html">git-pull(1)</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_push"></a>push
</dt>
<dd>
<p>
Pushing a <a href="#def_branch">branch</a> means to get the branch’s
<a href="#def_head_ref">head ref</a> from a remote <a href="#def_repository">repository</a>,
find out if it is a direct ancestor to the branch’s local
head ref, and in that case, putting all
objects, which are <a href="#def_reachable">reachable</a> from the local
head ref, and which are missing from the remote
repository, into the remote
<a href="#def_object_database">object database</a>, and updating the remote
head ref. If the remote <a href="#def_head">head</a> is not an
ancestor to the local head, the push fails.
</p>
</dd>
<dt class="hdlist1">
<a id="def_reachable"></a>reachable
</dt>
<dd>
<p>
All of the ancestors of a given <a href="#def_commit">commit</a> are said to be
"reachable" from that commit. More
generally, one <a href="#def_object">object</a> is reachable from
another if we can reach the one from the other by a <a href="#def_chain">chain</a>
that follows <a href="#def_tag">tags</a> to whatever they tag,
<a href="#def_commit_object">commits</a> to their parents or trees, and
<a href="#def_tree_object">trees</a> to the trees or <a href="#def_blob_object">blobs</a>
that they contain.
</p>
</dd>
<dt class="hdlist1">
<a id="def_rebase"></a>rebase
</dt>
<dd>
<p>
To reapply a series of changes from a <a href="#def_branch">branch</a> to a
different base, and reset the <a href="#def_head">head</a> of that branch
to the result.
</p>
</dd>
<dt class="hdlist1">
<a id="def_ref"></a>ref
</dt>
<dd>
<p>
A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that
denotes a particular <a href="#def_object">object</a>. They may be stored in
a file under <tt>$GIT_DIR/refs/</tt> directory, or
in the <tt>$GIT_DIR/packed-refs</tt> file.
</p>
</dd>
<dt class="hdlist1">
<a id="def_reflog"></a>reflog
</dt>
<dd>
<p>
A reflog shows the local "history" of a ref. In other words,
it can tell you what the 3rd last revision in <em>this</em> repository
was, and what was the current state in <em>this</em> repository,
yesterday 9:14pm. See <a href="git-reflog.html">git-reflog(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
<a id="def_refspec"></a>refspec
</dt>
<dd>
<p>
A "refspec" is used by <a href="#def_fetch">fetch</a> and
<a href="#def_push">push</a> to describe the mapping between remote
<a href="#def_ref">ref</a> and local ref. They are combined with a colon in
the format <src>:<dst>, preceded by an optional plus sign, +.
For example: <tt>git fetch $URL
refs/heads/master:refs/heads/origin</tt> means "grab the master
<a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store
it as my origin branch head". And <tt>git push
$URL refs/heads/master:refs/heads/to-upstream</tt> means "publish my
master branch head as to-upstream branch at $URL". See also
<a href="git-push.html">git-push(1)</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_remote_tracking_branch"></a>remote-tracking branch
</dt>
<dd>
<p>
A regular git <a href="#def_branch">branch</a> that is used to follow changes from
another <a href="#def_repository">repository</a>. A remote-tracking
branch should not contain direct modifications or have local commits
made to it. A remote-tracking branch can usually be
identified as the right-hand-side <a href="#def_ref">ref</a> in a Pull:
<a href="#def_refspec">refspec</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_repository"></a>repository
</dt>
<dd>
<p>
A collection of <a href="#def_ref">refs</a> together with an
<a href="#def_object_database">object database</a> containing all objects
which are <a href="#def_reachable">reachable</a> from the refs, possibly
accompanied by meta data from one or more <a href="#def_porcelain">porcelains</a>. A
repository can share an object database with other repositories
via <a href="#def_alternate_object_database">alternates mechanism</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_resolve"></a>resolve
</dt>
<dd>
<p>
The action of fixing up manually what a failed automatic
<a href="#def_merge">merge</a> left behind.
</p>
</dd>
<dt class="hdlist1">
<a id="def_revision"></a>revision
</dt>
<dd>
<p>
A particular state of files and directories which was stored in the
<a href="#def_object_database">object database</a>. It is referenced by a
<a href="#def_commit_object">commit object</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_rewind"></a>rewind
</dt>
<dd>
<p>
To throw away part of the development, i.e. to assign the
<a href="#def_head">head</a> to an earlier <a href="#def_revision">revision</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_SCM"></a>SCM
</dt>
<dd>
<p>
Source code management (tool).
</p>
</dd>
<dt class="hdlist1">
<a id="def_SHA1"></a>SHA1
</dt>
<dd>
<p>
Synonym for <a href="#def_object_name">object name</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_shallow_repository"></a>shallow repository
</dt>
<dd>
<p>
A shallow <a href="#def_repository">repository</a> has an incomplete
history some of whose <a href="#def_commit">commits</a> have <a href="#def_parent">parents</a> cauterized away (in other
words, git is told to pretend that these commits do not have the
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
recent history of a project even though the real history recorded in the
upstream is much larger. A shallow repository
is created by giving the <tt>--depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and
its history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_symref"></a>symref
</dt>
<dd>
<p>
Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a>
id itself, it is of the format <em>ref: refs/some/thing</em> and when
referenced, it recursively dereferences to this reference.
<em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic
references are manipulated with the <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>
command.
</p>
</dd>
<dt class="hdlist1">
<a id="def_tag"></a>tag
</dt>
<dd>
<p>
A <a href="#def_ref">ref</a> under <tt>refs/tags/</tt> namespace that points to an
object of an arbitrary type (typically a tag points to either a
<a href="#def_tag_object">tag</a> or a <a href="#def_commit_object">commit object</a>).
In contrast to a <a href="#def_head">head</a>, a tag is not updated by
the <tt>commit</tt> command. A git tag has nothing to do with a Lisp
tag (which would be called an <a href="#def_object_type">object type</a>
in git’s context). A tag is most typically used to mark a particular
point in the commit ancestry <a href="#def_chain">chain</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_tag_object"></a>tag object
</dt>
<dd>
<p>
An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to
another object, which can contain a message just like a
<a href="#def_commit_object">commit object</a>. It can also contain a (PGP)
signature, in which case it is called a "signed tag object".
</p>
</dd>
<dt class="hdlist1">
<a id="def_topic_branch"></a>topic branch
</dt>
<dd>
<p>
A regular git <a href="#def_branch">branch</a> that is used by a developer to
identify a conceptual line of development. Since branches are very easy
and inexpensive, it is often desirable to have several small branches
that each contain very well defined concepts or small incremental yet
related changes.
</p>
</dd>
<dt class="hdlist1">
<a id="def_tree"></a>tree
</dt>
<dd>
<p>
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
(i.e. a stored representation of a working tree).
</p>
</dd>
<dt class="hdlist1">
<a id="def_tree_object"></a>tree object
</dt>
<dd>
<p>
An <a href="#def_object">object</a> containing a list of file names and modes along
with refs to the associated blob and/or tree objects. A
<a href="#def_tree">tree</a> is equivalent to a <a href="#def_directory">directory</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_tree-ish"></a>tree-ish
</dt>
<dd>
<p>
A <a href="#def_ref">ref</a> pointing to either a <a href="#def_commit_object">commit object</a>, a <a href="#def_tree_object">tree object</a>, or a <a href="#def_tag_object">tag object</a> pointing to a tag or commit or tree object.
</p>
</dd>
<dt class="hdlist1">
<a id="def_unmerged_index"></a>unmerged index
</dt>
<dd>
<p>
An <a href="#def_index">index</a> which contains unmerged
<a href="#def_index_entry">index entries</a>.
</p>
</dd>
<dt class="hdlist1">
<a id="def_unreachable_object"></a>unreachable object
</dt>
<dd>
<p>
An <a href="#def_object">object</a> which is not <a href="#def_reachable">reachable</a> from a
<a href="#def_branch">branch</a>, <a href="#def_tag">tag</a>, or any other reference.
</p>
</dd>
<dt class="hdlist1">
<a id="def_upstream_branch"></a>upstream branch
</dt>
<dd>
<p>
The default <a href="#def_branch">branch</a> that is merged into the branch in
question (or the branch in question is rebased onto). It is configured
via branch.<name>.remote and branch.<name>.merge. If the upstream branch
of <em>A</em> is <em>origin/B</em> sometimes we say "<em>A</em> is tracking <em>origin/B</em>".
</p>
</dd>
<dt class="hdlist1">
<a id="def_working_tree"></a>working tree
</dt>
<dd>
<p>
The tree of actual checked out files. The working tree normally
contains the contents of the <a href="#def_HEAD">HEAD</a> commit’s tree,
plus any local changes that you have made but not yet committed.
</p>
</dd>
</dl></div>
</div>
</div>
<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>,
<a href="gittutorial-2.html">gittutorial-2(7)</a>,
<a href="gitcvs-migration.html">gitcvs-migration(7)</a>,
<a href="everyday.html">Everyday git</a>,
<a href="user-manual.html">The Git User’s Manual</a></p></div>
</div>
</div>
<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2012-03-26 21:42:17 UTC
</div>
</div>
</body>
</html>
|