| <!DOCTYPE html> |
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
| <head> |
| <meta charset="UTF-8"/> |
| <meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
| <meta name="viewport" content="width=device-width, initial-scale=1.0"/> |
| <meta name="generator" content="Asciidoctor 2.0.23"/> |
| <title>gitglossary(7)</title> |
| <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"/> |
| <style> |
| /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ |
| /* Uncomment the following line when using as a custom stylesheet */ |
| /* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"; */ |
| html{font-family:sans-serif;-webkit-text-size-adjust:100%} |
| a{background:none} |
| a:focus{outline:thin dotted} |
| a:active,a:hover{outline:0} |
| h1{font-size:2em;margin:.67em 0} |
| b,strong{font-weight:bold} |
| abbr{font-size:.9em} |
| abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none} |
| dfn{font-style:italic} |
| hr{height:0} |
| mark{background:#ff0;color:#000} |
| code,kbd,pre,samp{font-family:monospace;font-size:1em} |
| pre{white-space:pre-wrap} |
| q{quotes:"\201C" "\201D" "\2018" "\2019"} |
| small{font-size:80%} |
| sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} |
| sup{top:-.5em} |
| sub{bottom:-.25em} |
| img{border:0} |
| svg:not(:root){overflow:hidden} |
| figure{margin:0} |
| audio,video{display:inline-block} |
| audio:not([controls]){display:none;height:0} |
| fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} |
| legend{border:0;padding:0} |
| button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} |
| button,input{line-height:normal} |
| button,select{text-transform:none} |
| button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} |
| button[disabled],html input[disabled]{cursor:default} |
| input[type=checkbox],input[type=radio]{padding:0} |
| button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} |
| textarea{overflow:auto;vertical-align:top} |
| table{border-collapse:collapse;border-spacing:0} |
| *,::before,::after{box-sizing:border-box} |
| html,body{font-size:100%} |
| body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} |
| a:hover{cursor:pointer} |
| img,object,embed{max-width:100%;height:auto} |
| object,embed{height:100%} |
| img{-ms-interpolation-mode:bicubic} |
| .left{float:left!important} |
| .right{float:right!important} |
| .text-left{text-align:left!important} |
| .text-right{text-align:right!important} |
| .text-center{text-align:center!important} |
| .text-justify{text-align:justify!important} |
| .hide{display:none} |
| img,object,svg{display:inline-block;vertical-align:middle} |
| textarea{height:auto;min-height:50px} |
| select{width:100%} |
| .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em} |
| div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0} |
| a{color:#2156a5;text-decoration:underline;line-height:inherit} |
| a:hover,a:focus{color:#1d4b8f} |
| a img{border:0} |
| p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} |
| p aside{font-size:.875em;line-height:1.35;font-style:italic} |
| h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em} |
| h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0} |
| h1{font-size:2.125em} |
| h2{font-size:1.6875em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em} |
| h4,h5{font-size:1.125em} |
| h6{font-size:1em} |
| hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em} |
| em,i{font-style:italic;line-height:inherit} |
| strong,b{font-weight:bold;line-height:inherit} |
| small{font-size:60%;line-height:inherit} |
| code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)} |
| ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} |
| ul,ol{margin-left:1.5em} |
| ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0} |
| ul.circle{list-style-type:circle} |
| ul.disc{list-style-type:disc} |
| ul.square{list-style-type:square} |
| ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit} |
| ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} |
| dl dt{margin-bottom:.3125em;font-weight:bold} |
| dl dd{margin-bottom:1.25em} |
| blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd} |
| blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)} |
| @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2} |
| h1{font-size:2.75em} |
| h2{font-size:2.3125em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em} |
| h4{font-size:1.4375em}} |
| table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal} |
| table thead,table tfoot{background:#f7f8f7} |
| table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left} |
| table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)} |
| table tr.even,table tr.alt{background:#f8f8f7} |
| table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6} |
| h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em} |
| h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400} |
| .center{margin-left:auto;margin-right:auto} |
| .stretch{width:100%} |
| .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table} |
| .clearfix::after,.float-group::after{clear:both} |
| :not(pre).nobreak{word-wrap:normal} |
| :not(pre).nowrap{white-space:nowrap} |
| :not(pre).pre-wrap{white-space:pre-wrap} |
| :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed} |
| pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} |
| pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} |
| pre>code{display:block} |
| pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} |
| em em{font-style:normal} |
| strong strong{font-weight:400} |
| .keyseq{color:rgba(51,51,51,.8)} |
| kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap} |
| .keyseq kbd:first-child{margin-left:0} |
| .keyseq kbd:last-child{margin-right:0} |
| .menuseq,.menuref{color:#000} |
| .menuseq b:not(.caret),.menuref{font-weight:inherit} |
| .menuseq{word-spacing:-.02em} |
| .menuseq b.caret{font-size:1.25em;line-height:.8} |
| .menuseq i.caret{font-weight:bold;text-align:center;width:.45em} |
| b.button::before,b.button::after{position:relative;top:-1px;font-weight:400} |
| b.button::before{content:"[";padding:0 3px 0 2px} |
| b.button::after{content:"]";padding:0 2px 0 3px} |
| p a>code:hover{color:rgba(0,0,0,.9)} |
| #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em} |
| #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table} |
| #header::after,#content::after,#footnotes::after,#footer::after{clear:both} |
| #content{margin-top:1.25em} |
| #content::before{content:none} |
| #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0} |
| #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf} |
| #header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap} |
| #header .details span:first-child{margin-left:-.125em} |
| #header .details span.email a{color:rgba(0,0,0,.85)} |
| #header .details br{display:none} |
| #header .details br+span::before{content:"\00a0\2013\00a0"} |
| #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)} |
| #header .details br+span#revremark::before{content:"\00a0|\00a0"} |
| #header #revnumber{text-transform:capitalize} |
| #header #revnumber::after{content:"\00a0"} |
| #content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem} |
| #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em} |
| #toc>ul{margin-left:.125em} |
| #toc ul.sectlevel0>li>a{font-style:italic} |
| #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0} |
| #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none} |
| #toc li{line-height:1.3334;margin-top:.3334em} |
| #toc a{text-decoration:none} |
| #toc a:active{text-decoration:underline} |
| #toctitle{color:#7a2518;font-size:1.2em} |
| @media screen and (min-width:768px){#toctitle{font-size:1.375em} |
| body.toc2{padding-left:15em;padding-right:0} |
| body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto} |
| #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} |
| #toc.toc2>ul{font-size:.9em;margin-bottom:0} |
| #toc.toc2 ul ul{margin-left:0;padding-left:1em} |
| #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} |
| body.toc2.toc-right{padding-left:0;padding-right:15em} |
| body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} |
| @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} |
| #toc.toc2{width:20em} |
| #toc.toc2 #toctitle{font-size:1.375em} |
| #toc.toc2>ul{font-size:.95em} |
| #toc.toc2 ul ul{padding-left:1.25em} |
| body.toc2.toc-right{padding-left:0;padding-right:20em}} |
| #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px} |
| #content #toc>:first-child{margin-top:0} |
| #content #toc>:last-child{margin-bottom:0} |
| #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} |
| #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44} |
| #content{margin-bottom:.625em} |
| .sect1{padding-bottom:.625em} |
| @media screen and (min-width:768px){#content{margin-bottom:1.25em} |
| .sect1{padding-bottom:1.25em}} |
| .sect1:last-child{padding-bottom:0} |
| .sect1+.sect1{border-top:1px solid #e7e7e9} |
| #content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400} |
| #content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em} |
| #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible} |
| #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none} |
| #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221} |
| details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} |
| details{margin-left:1.25rem} |
| details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent} |
| details>summary::-webkit-details-marker{display:none} |
| details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)} |
| details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)} |
| details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem} |
| .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic} |
| table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} |
| .paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)} |
| .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} |
| .admonitionblock>table td.icon{text-align:center;width:80px} |
| .admonitionblock>table td.icon img{max-width:none} |
| .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} |
| .admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere} |
| .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} |
| .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px} |
| .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px} |
| .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} |
| .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0} |
| .exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0} |
| .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} |
| @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} |
| @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} |
| .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
| .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
| .listingblock>.content{position:relative} |
| .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5} |
| .listingblock:hover code[data-lang]::before{display:block} |
| .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
| .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} |
| .listingblock pre.highlightjs{padding:0} |
| .listingblock pre.highlightjs>code{padding:1em;border-radius:4px} |
| .listingblock pre.prettyprint{border-width:0} |
| .prettyprint{background:#f7f7f8} |
| pre.prettyprint .linenums{line-height:1.45;margin-left:2em} |
| pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} |
| pre.prettyprint li code[data-lang]::before{opacity:1} |
| pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} |
| table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} |
| table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} |
| table.linenotable td.code{padding-left:.75em} |
| table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} |
| pre.pygments span.linenos{display:inline-block;margin-right:.75em} |
| .quoteblock{margin:0 1em 1.25em 1.5em;display:table} |
| .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} |
| .quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify} |
| .quoteblock blockquote{margin:0;padding:0;border:0} |
| .quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)} |
| .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} |
| .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} |
| .verseblock{margin:0 1em 1.25em} |
| .verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility} |
| .verseblock pre strong{font-weight:400} |
| .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} |
| .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} |
| .quoteblock .attribution br,.verseblock .attribution br{display:none} |
| .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} |
| .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} |
| .quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0} |
| .quoteblock.abstract{margin:0 1em 1.25em;display:block} |
| .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} |
| .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} |
| .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} |
| .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} |
| .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} |
| p.tableblock:last-child{margin-bottom:0} |
| td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} |
| td.tableblock>.content>:last-child{margin-bottom:-1.25em} |
| table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} |
| table.grid-all>*>tr>*{border-width:1px} |
| table.grid-cols>*>tr>*{border-width:0 1px} |
| table.grid-rows>*>tr>*{border-width:1px 0} |
| table.frame-all{border-width:1px} |
| table.frame-ends{border-width:1px 0} |
| table.frame-sides{border-width:0 1px} |
| table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} |
| table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} |
| table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} |
| table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} |
| table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7} |
| th.halign-left,td.halign-left{text-align:left} |
| th.halign-right,td.halign-right{text-align:right} |
| th.halign-center,td.halign-center{text-align:center} |
| th.valign-top,td.valign-top{vertical-align:top} |
| th.valign-bottom,td.valign-bottom{vertical-align:bottom} |
| th.valign-middle,td.valign-middle{vertical-align:middle} |
| table thead th,table tfoot th{font-weight:bold} |
| tbody tr th{background:#f7f8f7} |
| tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} |
| p.tableblock>code:only-child{background:none;padding:0} |
| p.tableblock{font-size:1em} |
| ol{margin-left:1.75em} |
| ul li ol{margin-left:1.5em} |
| dl dd{margin-left:1.125em} |
| dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} |
| li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} |
| ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} |
| ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} |
| ul.unstyled,ol.unstyled{margin-left:0} |
| li>p:empty:only-child::before{content:"";display:inline-block} |
| ul.checklist>li>p:first-child{margin-left:-1em} |
| ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em} |
| ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em} |
| ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} |
| ul.inline>li{margin-left:1.25em} |
| .unstyled dl dt{font-weight:400;font-style:normal} |
| ol.arabic{list-style-type:decimal} |
| ol.decimal{list-style-type:decimal-leading-zero} |
| 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} |
| ol.lowergreek{list-style-type:lower-greek} |
| .hdlist>table,.colist>table{border:0;background:none} |
| .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} |
| td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} |
| td.hdlist1{font-weight:bold;padding-bottom:1.25em} |
| td.hdlist2{word-wrap:anywhere} |
| .literalblock+.colist,.listingblock+.colist{margin-top:-.5em} |
| .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} |
| .colist td:not([class]):first-child img{max-width:none} |
| .colist td:not([class]):last-child{padding:.25em 0} |
| .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd} |
| .imageblock.left{margin:.25em .625em 1.25em 0} |
| .imageblock.right{margin:.25em 0 1.25em .625em} |
| .imageblock>.title{margin-bottom:0} |
| .imageblock.thumb,.imageblock.th{border-width:6px} |
| .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} |
| .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} |
| .image.left{margin-right:.625em} |
| .image.right{margin-left:.625em} |
| a.image{text-decoration:none;display:inline-block} |
| a.image object{pointer-events:none} |
| sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} |
| sup.footnote a,sup.footnoteref a{text-decoration:none} |
| sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline} |
| #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} |
| #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} |
| #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} |
| #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} |
| #footnotes .footnote:last-of-type{margin-bottom:0} |
| #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} |
| div.unbreakable{page-break-inside:avoid} |
| .big{font-size:larger} |
| .small{font-size:smaller} |
| .underline{text-decoration:underline} |
| .overline{text-decoration:overline} |
| .line-through{text-decoration:line-through} |
| .aqua{color:#00bfbf} |
| .aqua-background{background:#00fafa} |
| .black{color:#000} |
| .black-background{background:#000} |
| .blue{color:#0000bf} |
| .blue-background{background:#0000fa} |
| .fuchsia{color:#bf00bf} |
| .fuchsia-background{background:#fa00fa} |
| .gray{color:#606060} |
| .gray-background{background:#7d7d7d} |
| .green{color:#006000} |
| .green-background{background:#007d00} |
| .lime{color:#00bf00} |
| .lime-background{background:#00fa00} |
| .maroon{color:#600000} |
| .maroon-background{background:#7d0000} |
| .navy{color:#000060} |
| .navy-background{background:#00007d} |
| .olive{color:#606000} |
| .olive-background{background:#7d7d00} |
| .purple{color:#600060} |
| .purple-background{background:#7d007d} |
| .red{color:#bf0000} |
| .red-background{background:#fa0000} |
| .silver{color:#909090} |
| .silver-background{background:#bcbcbc} |
| .teal{color:#006060} |
| .teal-background{background:#007d7d} |
| .white{color:#bfbfbf} |
| .white-background{background:#fafafa} |
| .yellow{color:#bfbf00} |
| .yellow-background{background:#fafa00} |
| span.icon>.fa{cursor:default} |
| a span.icon>.fa{cursor:inherit} |
| .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} |
| .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} |
| .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} |
| .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} |
| .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} |
| .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} |
| .conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold} |
| .conum[data-value] *{color:#fff!important} |
| .conum[data-value]+b{display:none} |
| .conum[data-value]::after{content:attr(data-value)} |
| pre .conum[data-value]{position:relative;top:-.125em} |
| b.conum *{color:inherit!important} |
| .conum:not([data-value]):empty{display:none} |
| dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} |
| h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em} |
| p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} |
| p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem} |
| p{margin-bottom:1.25rem} |
| .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} |
| .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc} |
| .print-only{display:none!important} |
| @page{margin:1.25cm .75cm} |
| @media print{*{box-shadow:none!important;text-shadow:none!important} |
| html{font-size:80%} |
| a{color:inherit!important;text-decoration:underline!important} |
| a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} |
| a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} |
| abbr[title]{border-bottom:1px dotted} |
| abbr[title]::after{content:" (" attr(title) ")"} |
| pre,blockquote,tr,img,object,svg{page-break-inside:avoid} |
| thead{display:table-header-group} |
| svg{max-width:100%} |
| p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} |
| h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} |
| #header,#content,#footnotes,#footer{max-width:none} |
| #toc,.sidebarblock,.exampleblock>.content{background:none!important} |
| #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} |
| body.book #header{text-align:center} |
| body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} |
| body.book #header .details{border:0!important;display:block;padding:0!important} |
| body.book #header .details span:first-child{margin-left:0!important} |
| body.book #header .details br{display:block} |
| body.book #header .details br+span::before{content:none!important} |
| body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} |
| body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} |
| .listingblock code[data-lang]::before{display:block} |
| #footer{padding:0 .9375em} |
| .hide-on-print{display:none!important} |
| .print-only{display:block!important} |
| .hide-for-print{display:none!important} |
| .show-for-print{display:inherit!important}} |
| @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem} |
| .sect1{padding:0!important} |
| .sect1+.sect1{border:0} |
| #footer{background:none} |
| #footer-text{color:rgba(0,0,0,.6);font-size:.9em}} |
| @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} |
| </style> |
| <style> |
| pre>code { |
| display: inline; |
| } |
| </style> |
| </head> |
| <body class="manpage"> |
| <div id="header"> |
| <h1>gitglossary(7) Manual Page</h1> |
| <h2 id="_name">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 an "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 .<code>git</code> suffix that does not |
| have a locally checked-out copy of any of the files under |
| revision control. That is, all of the Git |
| administrative and control files that would normally be present in the |
| hidden .<code>git</code> sub-directory are directly present in the |
| <code>repository.git</code> 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 a 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 <a href="#def_ref">referenced</a> 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_graph_general"></a>commit graph concept, representations and usage</dt> |
| <dd> |
| <p>A synonym for the <a href="#def_DAG">DAG</a> structure formed by the commits |
| in the object database, <a href="#def_ref">referenced</a> by branch tips, |
| using their <a href="#def_chain">chain</a> of linked commits. |
| This structure is the definitive commit graph. The |
| graph can be represented in other ways, e.g. the |
| <a href="#def_commit_graph_file">"commit-graph" file</a>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_commit_graph_file"></a>commit-graph file</dt> |
| <dd> |
| <p>The "commit-graph" (normally hyphenated) file is a supplemental |
| representation of the <a href="#def_commit_graph_general">commit graph</a> |
| which accelerates commit graph walks. The "commit-graph" file is |
| stored either in the .git/objects/info directory or in the info |
| directory of an alternate object database.</p> |
| </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_commit-ish"></a>commit-ish (also committish)</dt> |
| <dd> |
| <p>A <a href="#def_commit_object">commit object</a> or an <a href="#def_object">object</a> that |
| can be recursively <a href="#def_dereference">dereferenced</a> to a commit object. |
| The following are all commit-ishes: |
| a commit object, |
| a <a href="#def_tag_object">tag object</a> that points to a commit |
| object, |
| a tag object that points to a tag object that points to a |
| commit object, |
| etc.</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_dereference"></a>dereference</dt> |
| <dd> |
| <p>Referring to a <a href="#def_symref">symbolic ref</a>: the action of accessing the |
| <a href="#def_ref">reference</a> pointed at by a symbolic ref. Recursive |
| dereferencing involves repeating the aforementioned process on the |
| resulting ref until a non-symbolic reference is found.</p> |
| <div class="paragraph"> |
| <p>Referring to a <a href="#def_tag_object">tag object</a>: the action of accessing the |
| <a href="#def_object">object</a> a tag points at. Tags are recursively dereferenced by |
| repeating the operation on the result object until the result has either a |
| specified <a href="#def_object_type">object type</a> (where applicable) or any non-"tag" |
| object type. A synonym for "recursive dereference" in the context of tags is |
| "<a href="#def_peel">peel</a>".</p> |
| </div> |
| <div class="paragraph"> |
| <p>Referring to a <a href="#def_commit_object">commit object</a>: the action of accessing |
| the commit’s tree object. Commits cannot be dereferenced recursively.</p> |
| </div> |
| <div class="paragraph"> |
| <p>Unless otherwise specified, "dereferencing" as it used in the context of Git |
| commands or protocols is implicitly recursive.</p> |
| </div> |
| </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>, and commands that operate on the |
| history HEAD represents operate on the history leading to the |
| tip of the branch the HEAD points at. 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. The HEAD in such a state is called |
| "detached".</p> |
| <div class="paragraph"> |
| <p>Note that commands that operate on the history of the current branch |
| (e.g. <code>git</code> <code>commit</code> to build a new history on top of it) still work |
| while the HEAD is detached. They update the HEAD to point at the tip |
| of the updated history without affecting any branch. Commands that |
| update or inquire information <em>about</em> the current branch (e.g. <code>git</code> |
| <code>branch</code> <code>--set-upstream-to</code> that sets what remote-tracking branch the |
| current branch integrates with) obviously do not work, as there is no |
| (real) current branch to ask about in this state.</p> |
| </div> |
| </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_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 a case, you do not make a new <a href="#def_merge">merge</a> |
| <a href="#def_commit">commit</a> but instead just update your branch to point at the same |
| revision as the branch you are merging. 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_gitfile"></a>gitfile</dt> |
| <dd> |
| <p>A plain file .<code>git</code> at the root of a working tree that |
| points at the directory that is the real repository. |
| For proper use see <a href="git-worktree.html">git-worktree(1)</a> or <a href="git-submodule.html">git-submodule(1)</a>. |
| For syntax see <a href="gitrepository-layout.html">gitrepository-layout(5)</a>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_grafts"></a>grafts</dt> |
| <dd> |
| <p>Grafts enable 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 .<code>git/info/grafts</code> file.</p> |
| <div class="paragraph"> |
| <p>Note that the grafts mechanism is outdated and can lead to problems |
| transferring objects between repositories; see <a href="git-replace.html">git-replace(1)</a> |
| for a more flexible and robust system to do the same thing.</p> |
| </div> |
| </dd> |
| <dt class="hdlist1"><a id="def_hash"></a>hash</dt> |
| <dd> |
| <p>In Git’s context, synonym for <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 |
| <code>$GIT_DIR/refs/heads/</code> 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 |
| <code>$GIT_DIR/hooks/</code> directory, and are enabled by simply |
| removing the .<code>sample</code> 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">SHA-1</a> of its contents. Consequently, an |
| object cannot 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 <code>$GIT_DIR/objects/</code>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_object_identifier"></a>object identifier (oid)</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 |
| object name is usually represented by a 40 character |
| hexadecimal string. Also colloquially called <a href="#def_SHA1">SHA-1</a>.</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>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_orphan"></a>orphan</dt> |
| <dd> |
| <p>The act of getting on a <a href="#def_branch">branch</a> that does not |
| exist yet (i.e., an <a href="#def_unborn">unborn</a> branch). After |
| such an operation, the commit first created becomes a commit |
| without a parent, starting a new history.</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 <a href="#def_remote_tracking_branch">remote-tracking branches</a> named |
| origin/name-of-upstream-branch, which you can see using |
| <code>git</code> <code>branch</code> <code>-r</code>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_overlay"></a>overlay</dt> |
| <dd> |
| <p>Only update and add files to the working directory, but don’t |
| delete them, similar to how <em>cp -R</em> would update the contents |
| in the destination directory. This is the default mode in a |
| <a href="#def_checkout">checkout</a> when checking out files from the |
| <a href="#def_index">index</a> or a <a href="#def_tree-ish">tree-ish</a>. In |
| contrast, no-overlay mode also deletes tracked files not |
| present in the source, similar to <em>rsync --delete</em>.</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 limit paths in Git commands.</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 |
| working tree. 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="openblock"> |
| <div class="content"> |
| <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> |
| </li> |
| </ul> |
| </div> |
| </div> |
| </div> |
| <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> |
| <div class="paragraph"> |
| <p>A pathspec that begins with a colon <code>:</code> has special meaning. In the |
| short form, the leading colon <code>:</code> is followed by zero or more "magic |
| signature" letters (which optionally is terminated by another colon <code>:</code>), |
| and the remainder is the pattern to match against the path. |
| The "magic signature" consists of ASCII symbols that are neither |
| alphanumeric, glob, regex special characters nor colon. |
| The optional colon that terminates the "magic signature" can be |
| omitted if the pattern begins with a character that does not belong to |
| "magic signature" symbol set and is not a colon.</p> |
| </div> |
| <div class="paragraph"> |
| <p>In the long form, the leading colon <code>:</code> is followed by an open |
| parenthesis (, a comma-separated list of zero or more "magic words", |
| and a close parentheses ), and the remainder is the pattern to match |
| against the path.</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> |
| <div class="openblock"> |
| <div class="content"> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1">top</dt> |
| <dd> |
| <p>The magic word <code>top</code> (magic signature: <code>/</code>) makes the pattern |
| match from the root of the working tree, even when you are |
| running the command from inside a subdirectory.</p> |
| </dd> |
| <dt class="hdlist1">literal</dt> |
| <dd> |
| <p>Wildcards in the pattern such as <code>*</code> or ? are treated |
| as literal characters.</p> |
| </dd> |
| <dt class="hdlist1">icase</dt> |
| <dd> |
| <p>Case insensitive match.</p> |
| </dd> |
| <dt class="hdlist1">glob</dt> |
| <dd> |
| <p>Git treats the pattern as a shell glob suitable for |
| consumption by fnmatch(3) with the FNM_PATHNAME flag: |
| wildcards in the pattern will not match a / in the pathname. |
| For example, "Documentation/*.html" matches |
| "Documentation/git.html" but not "Documentation/ppc/ppc.html" |
| or "tools/perf/Documentation/perf.html".</p> |
| <div class="paragraph"> |
| <p>Two consecutive asterisks ("<code>**</code>") in patterns matched against |
| full pathname may have special meaning:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>A leading "<code>**</code>" followed by a slash means match in all |
| directories. For example, "<code>**/foo</code>" matches file or directory |
| "<code>foo</code>" anywhere. "<code>**/foo/bar</code>" matches file or directory "<code>bar</code>" |
| anywhere that is directly under directory "<code>foo</code>".</p> |
| </li> |
| <li> |
| <p>A trailing "<code>/**</code>" matches everything inside. For example, |
| "<code>abc/**</code>" matches all files inside directory "abc", relative |
| to the location of the .<code>gitignore</code> file, with infinite depth.</p> |
| </li> |
| <li> |
| <p>A slash followed by two consecutive asterisks then a slash |
| matches zero or more directories. For example, "<code>a/**/b</code>" |
| matches "<code>a/b</code>", "<code>a/x/b</code>", "<code>a/x/y/b</code>" and so on.</p> |
| </li> |
| <li> |
| <p>Other consecutive asterisks are considered invalid.</p> |
| <div class="paragraph"> |
| <p>Glob magic is incompatible with literal magic.</p> |
| </div> |
| </li> |
| </ul> |
| </div> |
| </dd> |
| <dt class="hdlist1">attr</dt> |
| <dd> |
| <p>After <code>attr:</code> comes a space separated list of "attribute |
| requirements", all of which must be met in order for the |
| path to be considered a match; this is in addition to the |
| usual non-magic pathspec pattern matching. |
| See <a href="gitattributes.html">gitattributes(5)</a>.</p> |
| <div class="paragraph"> |
| <p>Each of the attribute requirements for the path takes one of |
| these forms:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>"<code>ATTR</code>" requires that the attribute <code>ATTR</code> be set.</p> |
| </li> |
| <li> |
| <p>"<code>-ATTR</code>" requires that the attribute <code>ATTR</code> be unset.</p> |
| </li> |
| <li> |
| <p>"<code>ATTR=VALUE</code>" requires that the attribute <code>ATTR</code> be |
| set to the string <code>VALUE</code>.</p> |
| </li> |
| <li> |
| <p>"!ATTR" requires that the attribute <code>ATTR</code> be |
| unspecified.</p> |
| <div class="paragraph"> |
| <p>Note that when matching against a tree object, attributes are still |
| obtained from working tree, not from the given tree object.</p> |
| </div> |
| </li> |
| </ul> |
| </div> |
| </dd> |
| <dt class="hdlist1">exclude</dt> |
| <dd> |
| <p>After a path matches any non-exclude pathspec, it will be run |
| through all exclude pathspecs (magic signature: ! or its |
| synonym <code>^</code>). If it matches, the path is ignored. When there |
| is no non-exclude pathspec, the exclusion is applied to the |
| result set as if invoked without any pathspec.</p> |
| </dd> |
| </dl> |
| </div> |
| </div> |
| </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_peel"></a>peel</dt> |
| <dd> |
| <p>The action of recursively <a href="#def_dereference">dereferencing</a> a |
| <a href="#def_tag_object">tag object</a>.</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 <code>--pickaxe-all</code> 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_per_worktree_ref"></a>per-worktree ref</dt> |
| <dd> |
| <p>Refs that are per-<a href="#def_worktree">worktree</a>, rather than |
| global. This is presently only <a href="#def_HEAD">HEAD</a> and any refs |
| that start with <code>refs/bisect/</code>, but might later include other |
| unusual refs.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_pseudoref"></a>pseudoref</dt> |
| <dd> |
| <p>A ref that has different semantics than normal refs. These refs can be |
| read via normal Git commands, but cannot be written to by commands like |
| <a href="git-update-ref.html">git-update-ref(1)</a>.</p> |
| <div class="paragraph"> |
| <p>The following pseudorefs are known to Git:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p><code>FETCH_HEAD</code> is written by <a href="git-fetch.html">git-fetch(1)</a> or <a href="git-pull.html">git-pull(1)</a>. It |
| may refer to multiple object IDs. Each object ID is annotated with metadata |
| indicating where it was fetched from and its fetch status.</p> |
| </li> |
| <li> |
| <p><code>MERGE_HEAD</code> is written by <a href="git-merge.html">git-merge(1)</a> when resolving merge |
| conflicts. It contains all commit IDs which are being merged.</p> |
| </li> |
| </ul> |
| </div> |
| </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 an 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_reachability_bitmap"></a>reachability bitmaps</dt> |
| <dd> |
| <p>Reachability bitmaps store information about the |
| <a href="#def_reachable">reachability</a> of a selected set of commits in |
| a packfile, or a multi-pack index (MIDX), to speed up object search. |
| The bitmaps are stored in a ".bitmap" file. A repository may have at |
| most one bitmap file in use. The bitmap file may belong to either one |
| pack, or the repository’s multi-pack index (if it exists).</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 name that points to an <a href="#def_object_name">object name</a> or |
| another ref (the latter is called a <a href="#def_symref">symbolic ref</a>). |
| For convenience, a ref can sometimes be abbreviated when used |
| as an argument to a Git command; see <a href="gitrevisions.html">gitrevisions(7)</a> |
| for details. |
| Refs are stored in the <a href="#def_repository">repository</a>.</p> |
| <div class="paragraph"> |
| <p>The ref namespace is hierarchical. |
| Ref names must either start with <code>refs/</code> or be located in the root of |
| the hierarchy. For the latter, their name must follow these rules:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>The name consists of only upper-case characters or underscores.</p> |
| </li> |
| <li> |
| <p>The name ends with "<code>_HEAD</code>" or is equal to "<code>HEAD</code>".</p> |
| <div class="paragraph"> |
| <p>There are some irregular refs in the root of the hierarchy that do not |
| match these rules. The following list is exhaustive and shall not be |
| extended in the future:</p> |
| </div> |
| </li> |
| <li> |
| <p><code>AUTO_MERGE</code></p> |
| </li> |
| <li> |
| <p><code>BISECT_EXPECTED_REV</code></p> |
| </li> |
| <li> |
| <p><code>NOTES_MERGE_PARTIAL</code></p> |
| </li> |
| <li> |
| <p><code>NOTES_MERGE_REF</code></p> |
| </li> |
| <li> |
| <p><code>MERGE_AUTOSTASH</code></p> |
| <div class="paragraph"> |
| <p>Different subhierarchies are used for different purposes. For example, |
| the <code>refs/heads/</code> hierarchy is used to represent local branches whereas |
| the <code>refs/tags/</code> hierarchy is used to represent local tags..</p> |
| </div> |
| </li> |
| </ul> |
| </div> |
| </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. See <a href="git-fetch.html">git-fetch(1)</a> or |
| <a href="git-push.html">git-push(1)</a> for details.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_remote"></a>remote repository</dt> |
| <dd> |
| <p>A <a href="#def_repository">repository</a> which is used to track the same |
| project but resides somewhere else. To communicate with remotes, |
| see <a href="#def_fetch">fetch</a> or <a href="#def_push">push</a>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_remote_tracking_branch"></a>remote-tracking branch</dt> |
| <dd> |
| <p>A <a href="#def_ref">ref</a> that is used to follow changes from another |
| <a href="#def_repository">repository</a>. It typically looks like |
| <em>refs/remotes/foo/bar</em> (indicating that it tracks a branch named |
| <em>bar</em> in a remote named <em>foo</em>), and matches the right-hand-side of |
| a configured fetch <a href="#def_refspec">refspec</a>. A remote-tracking |
| branch should not contain direct modifications or have local |
| commits made to it.</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>Synonym for <a href="#def_commit">commit</a> (the noun).</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>SHA-1</dt> |
| <dd> |
| <p>"Secure Hash Algorithm 1"; a cryptographic hash function. |
| In the context of Git used as a synonym for <a href="#def_object_name">object name</a>.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_shallow_clone"></a>shallow clone</dt> |
| <dd> |
| <p>Mostly a synonym to <a href="#def_shallow_repository">shallow repository</a> |
| but the phrase makes it more explicit that it was created by |
| running <code>git</code> <code>clone</code> <code>--depth=..</code>. command.</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 <code>--depth</code> 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_stash"></a>stash entry</dt> |
| <dd> |
| <p>An <a href="#def_object">object</a> used to temporarily store the contents of a |
| <a href="#def_dirty">dirty</a> working directory and the index for future reuse.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_submodule"></a>submodule</dt> |
| <dd> |
| <p>A <a href="#def_repository">repository</a> that holds the history of a |
| separate project inside another repository (the latter of |
| which is called <a href="#def_superproject">superproject</a>).</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_superproject"></a>superproject</dt> |
| <dd> |
| <p>A <a href="#def_repository">repository</a> that references repositories |
| of other projects in its working tree as <a href="#def_submodule">submodules</a>. |
| The superproject knows about the names of (but does not hold |
| copies of) commit objects of the contained submodules.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_symref"></a>symref</dt> |
| <dd> |
| <p>Symbolic reference: instead of containing the <a href="#def_SHA1">SHA-1</a> id |
| itself, it is of the format <em>ref: refs/some/thing</em> and when referenced, |
| it recursively <a href="#def_dereference">dereferences</a> 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 <code>refs/tags/</code> 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 <code>commit</code> 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_trailer"></a>trailer</dt> |
| <dd> |
| <p>Key-value metadata. Trailers are optionally found at the end of |
| a commit message. Might be called "footers" or "tags" in other |
| communities. See <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>.</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 (also treeish)</dt> |
| <dd> |
| <p>A <a href="#def_tree_object">tree object</a> or an <a href="#def_object">object</a> that can |
| be recursively <a href="#def_dereference">dereferenced</a> to a tree object. |
| Dereferencing a <a href="#def_commit_object">commit object</a> yields the tree |
| object corresponding to the <a href="#def_revision">revision</a>'s top |
| <a href="#def_directory">directory</a>. |
| The following are all tree-ishes: |
| a <a href="#def_commit-ish">commit-ish</a>, |
| a tree object, |
| a <a href="#def_tag_object">tag object</a> that points to a tree object, |
| a tag object that points to a tag object that points to a tree |
| object, |
| etc.</p> |
| </dd> |
| <dt class="hdlist1"><a id="def_unborn"></a>unborn</dt> |
| <dd> |
| <p>The <a href="#def_HEAD">HEAD</a> can point at a <a href="#def_branch">branch</a> |
| that does not yet exist and that does not have any commit on |
| it yet, and such a branch is called an unborn branch. The |
| most typical way users encounter an unborn branch is by |
| creating a repository anew without cloning from elsewhere. |
| The HEAD would point at the <em>main</em> (or <em>master</em>, depending |
| on your configuration) branch that is yet to be born. Also |
| some operations can get you on an unborn branch with their |
| <a href="#def_orphan">orphan</a> option.</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> |
| <dt class="hdlist1"><a id="def_worktree"></a>worktree</dt> |
| <dd> |
| <p>A repository can have zero (i.e. bare repository) or one or |
| more worktrees attached to it. One "worktree" consists of a |
| "working tree" and repository metadata, most of which are |
| shared among other worktrees of a single repository, and |
| some of which are maintained separately per worktree |
| (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, |
| per-worktree refs and per-worktree configuration file).</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="giteveryday.html">giteveryday(7)</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="footer"> |
| <div id="footer-text"> |
| Last updated 2025-06-20 18:10:42 -0700 |
| </div> |
| </div> |
| </body> |
| </html> |
