Autogenerated HTML docs for v2.47.0-229-g8f8d6
[git-htmldocs.git] / gittutorial-2.html
blobeb7ca0084ec95dd60486f98ddcbaf4368bfab914
1 <!DOCTYPE html>
2 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
3 <head>
4 <meta charset="UTF-8"/>
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
6 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
7 <meta name="generator" content="Asciidoctor 2.0.20"/>
8 <title>gittutorial-2(7)</title>
9 <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"/>
10 <style>
11 /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
12 /* Uncomment the following line when using as a custom stylesheet */
13 /* @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"; */
14 html{font-family:sans-serif;-webkit-text-size-adjust:100%}
15 a{background:none}
16 a:focus{outline:thin dotted}
17 a:active,a:hover{outline:0}
18 h1{font-size:2em;margin:.67em 0}
19 b,strong{font-weight:bold}
20 abbr{font-size:.9em}
21 abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
22 dfn{font-style:italic}
23 hr{height:0}
24 mark{background:#ff0;color:#000}
25 code,kbd,pre,samp{font-family:monospace;font-size:1em}
26 pre{white-space:pre-wrap}
27 q{quotes:"\201C" "\201D" "\2018" "\2019"}
28 small{font-size:80%}
29 sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
30 sup{top:-.5em}
31 sub{bottom:-.25em}
32 img{border:0}
33 svg:not(:root){overflow:hidden}
34 figure{margin:0}
35 audio,video{display:inline-block}
36 audio:not([controls]){display:none;height:0}
37 fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
38 legend{border:0;padding:0}
39 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
40 button,input{line-height:normal}
41 button,select{text-transform:none}
42 button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
43 button[disabled],html input[disabled]{cursor:default}
44 input[type=checkbox],input[type=radio]{padding:0}
45 button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
46 textarea{overflow:auto;vertical-align:top}
47 table{border-collapse:collapse;border-spacing:0}
48 *,::before,::after{box-sizing:border-box}
49 html,body{font-size:100%}
50 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}
51 a:hover{cursor:pointer}
52 img,object,embed{max-width:100%;height:auto}
53 object,embed{height:100%}
54 img{-ms-interpolation-mode:bicubic}
55 .left{float:left!important}
56 .right{float:right!important}
57 .text-left{text-align:left!important}
58 .text-right{text-align:right!important}
59 .text-center{text-align:center!important}
60 .text-justify{text-align:justify!important}
61 .hide{display:none}
62 img,object,svg{display:inline-block;vertical-align:middle}
63 textarea{height:auto;min-height:50px}
64 select{width:100%}
65 .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}
66 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}
67 a{color:#2156a5;text-decoration:underline;line-height:inherit}
68 a:hover,a:focus{color:#1d4b8f}
69 a img{border:0}
70 p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
71 p aside{font-size:.875em;line-height:1.35;font-style:italic}
72 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}
73 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}
74 h1{font-size:2.125em}
75 h2{font-size:1.6875em}
76 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
77 h4,h5{font-size:1.125em}
78 h6{font-size:1em}
79 hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
80 em,i{font-style:italic;line-height:inherit}
81 strong,b{font-weight:bold;line-height:inherit}
82 small{font-size:60%;line-height:inherit}
83 code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
84 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
85 ul,ol{margin-left:1.5em}
86 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
87 ul.circle{list-style-type:circle}
88 ul.disc{list-style-type:disc}
89 ul.square{list-style-type:square}
90 ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
91 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
92 dl dt{margin-bottom:.3125em;font-weight:bold}
93 dl dd{margin-bottom:1.25em}
94 blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
95 blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
96 @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
97 h1{font-size:2.75em}
98 h2{font-size:2.3125em}
99 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
100 h4{font-size:1.4375em}}
101 table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
102 table thead,table tfoot{background:#f7f8f7}
103 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}
104 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
105 table tr.even,table tr.alt{background:#f8f8f7}
106 table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
107 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
108 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
109 .center{margin-left:auto;margin-right:auto}
110 .stretch{width:100%}
111 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
112 .clearfix::after,.float-group::after{clear:both}
113 :not(pre).nobreak{word-wrap:normal}
114 :not(pre).nowrap{white-space:nowrap}
115 :not(pre).pre-wrap{white-space:pre-wrap}
116 :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}
117 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
118 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
119 pre>code{display:block}
120 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
121 em em{font-style:normal}
122 strong strong{font-weight:400}
123 .keyseq{color:rgba(51,51,51,.8)}
124 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}
125 .keyseq kbd:first-child{margin-left:0}
126 .keyseq kbd:last-child{margin-right:0}
127 .menuseq,.menuref{color:#000}
128 .menuseq b:not(.caret),.menuref{font-weight:inherit}
129 .menuseq{word-spacing:-.02em}
130 .menuseq b.caret{font-size:1.25em;line-height:.8}
131 .menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
132 b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
133 b.button::before{content:"[";padding:0 3px 0 2px}
134 b.button::after{content:"]";padding:0 2px 0 3px}
135 p a>code:hover{color:rgba(0,0,0,.9)}
136 #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
137 #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
138 #header::after,#content::after,#footnotes::after,#footer::after{clear:both}
139 #content{margin-top:1.25em}
140 #content::before{content:none}
141 #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
142 #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
143 #header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
144 #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}
145 #header .details span:first-child{margin-left:-.125em}
146 #header .details span.email a{color:rgba(0,0,0,.85)}
147 #header .details br{display:none}
148 #header .details br+span::before{content:"\00a0\2013\00a0"}
149 #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
150 #header .details br+span#revremark::before{content:"\00a0|\00a0"}
151 #header #revnumber{text-transform:capitalize}
152 #header #revnumber::after{content:"\00a0"}
153 #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}
154 #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
155 #toc>ul{margin-left:.125em}
156 #toc ul.sectlevel0>li>a{font-style:italic}
157 #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
158 #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
159 #toc li{line-height:1.3334;margin-top:.3334em}
160 #toc a{text-decoration:none}
161 #toc a:active{text-decoration:underline}
162 #toctitle{color:#7a2518;font-size:1.2em}
163 @media screen and (min-width:768px){#toctitle{font-size:1.375em}
164 body.toc2{padding-left:15em;padding-right:0}
165 #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}
166 #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
167 #toc.toc2>ul{font-size:.9em;margin-bottom:0}
168 #toc.toc2 ul ul{margin-left:0;padding-left:1em}
169 #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
170 body.toc2.toc-right{padding-left:0;padding-right:15em}
171 body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
172 @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
173 #toc.toc2{width:20em}
174 #toc.toc2 #toctitle{font-size:1.375em}
175 #toc.toc2>ul{font-size:.95em}
176 #toc.toc2 ul ul{padding-left:1.25em}
177 body.toc2.toc-right{padding-left:0;padding-right:20em}}
178 #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
179 #content #toc>:first-child{margin-top:0}
180 #content #toc>:last-child{margin-bottom:0}
181 #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
182 #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
183 #content{margin-bottom:.625em}
184 .sect1{padding-bottom:.625em}
185 @media screen and (min-width:768px){#content{margin-bottom:1.25em}
186 .sect1{padding-bottom:1.25em}}
187 .sect1:last-child{padding-bottom:0}
188 .sect1+.sect1{border-top:1px solid #e7e7e9}
189 #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}
190 #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}
191 #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}
192 #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}
193 #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}
194 details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
195 details{margin-left:1.25rem}
196 details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
197 details>summary::-webkit-details-marker{display:none}
198 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%)}
199 details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
200 details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
201 .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}
202 table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
203 .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)}
204 .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
205 .admonitionblock>table td.icon{text-align:center;width:80px}
206 .admonitionblock>table td.icon img{max-width:none}
207 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
208 .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}
209 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
210 .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
211 .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
212 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
213 .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
214 .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}
215 .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
216 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
217 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
218 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
219 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
220 .listingblock>.content{position:relative}
221 .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}
222 .listingblock:hover code[data-lang]::before{display:block}
223 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
224 .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
225 .listingblock pre.highlightjs{padding:0}
226 .listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
227 .listingblock pre.prettyprint{border-width:0}
228 .prettyprint{background:#f7f7f8}
229 pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
230 pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
231 pre.prettyprint li code[data-lang]::before{opacity:1}
232 pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
233 table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
234 table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
235 table.linenotable td.code{padding-left:.75em}
236 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}
237 pre.pygments span.linenos{display:inline-block;margin-right:.75em}
238 .quoteblock{margin:0 1em 1.25em 1.5em;display:table}
239 .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
240 .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}
241 .quoteblock blockquote{margin:0;padding:0;border:0}
242 .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)}
243 .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
244 .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
245 .verseblock{margin:0 1em 1.25em}
246 .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}
247 .verseblock pre strong{font-weight:400}
248 .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
249 .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
250 .quoteblock .attribution br,.verseblock .attribution br{display:none}
251 .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
252 .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
253 .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}
254 .quoteblock.abstract{margin:0 1em 1.25em;display:block}
255 .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
256 .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
257 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
258 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
259 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
260 p.tableblock:last-child{margin-bottom:0}
261 td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
262 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
263 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
264 table.grid-all>*>tr>*{border-width:1px}
265 table.grid-cols>*>tr>*{border-width:0 1px}
266 table.grid-rows>*>tr>*{border-width:1px 0}
267 table.frame-all{border-width:1px}
268 table.frame-ends{border-width:1px 0}
269 table.frame-sides{border-width:0 1px}
270 table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
271 table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
272 table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
273 table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
274 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}
275 th.halign-left,td.halign-left{text-align:left}
276 th.halign-right,td.halign-right{text-align:right}
277 th.halign-center,td.halign-center{text-align:center}
278 th.valign-top,td.valign-top{vertical-align:top}
279 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
280 th.valign-middle,td.valign-middle{vertical-align:middle}
281 table thead th,table tfoot th{font-weight:bold}
282 tbody tr th{background:#f7f8f7}
283 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
284 p.tableblock>code:only-child{background:none;padding:0}
285 p.tableblock{font-size:1em}
286 ol{margin-left:1.75em}
287 ul li ol{margin-left:1.5em}
288 dl dd{margin-left:1.125em}
289 dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
290 li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
291 ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
292 ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
293 ul.unstyled,ol.unstyled{margin-left:0}
294 li>p:empty:only-child::before{content:"";display:inline-block}
295 ul.checklist>li>p:first-child{margin-left:-1em}
296 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}
297 ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
298 ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
299 ul.inline>li{margin-left:1.25em}
300 .unstyled dl dt{font-weight:400;font-style:normal}
301 ol.arabic{list-style-type:decimal}
302 ol.decimal{list-style-type:decimal-leading-zero}
303 ol.loweralpha{list-style-type:lower-alpha}
304 ol.upperalpha{list-style-type:upper-alpha}
305 ol.lowerroman{list-style-type:lower-roman}
306 ol.upperroman{list-style-type:upper-roman}
307 ol.lowergreek{list-style-type:lower-greek}
308 .hdlist>table,.colist>table{border:0;background:none}
309 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
310 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
311 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
312 td.hdlist2{word-wrap:anywhere}
313 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
314 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
315 .colist td:not([class]):first-child img{max-width:none}
316 .colist td:not([class]):last-child{padding:.25em 0}
317 .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
318 .imageblock.left{margin:.25em .625em 1.25em 0}
319 .imageblock.right{margin:.25em 0 1.25em .625em}
320 .imageblock>.title{margin-bottom:0}
321 .imageblock.thumb,.imageblock.th{border-width:6px}
322 .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
323 .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
324 .image.left{margin-right:.625em}
325 .image.right{margin-left:.625em}
326 a.image{text-decoration:none;display:inline-block}
327 a.image object{pointer-events:none}
328 sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
329 sup.footnote a,sup.footnoteref a{text-decoration:none}
330 sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
331 #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
332 #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
333 #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
334 #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
335 #footnotes .footnote:last-of-type{margin-bottom:0}
336 #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
337 div.unbreakable{page-break-inside:avoid}
338 .big{font-size:larger}
339 .small{font-size:smaller}
340 .underline{text-decoration:underline}
341 .overline{text-decoration:overline}
342 .line-through{text-decoration:line-through}
343 .aqua{color:#00bfbf}
344 .aqua-background{background:#00fafa}
345 .black{color:#000}
346 .black-background{background:#000}
347 .blue{color:#0000bf}
348 .blue-background{background:#0000fa}
349 .fuchsia{color:#bf00bf}
350 .fuchsia-background{background:#fa00fa}
351 .gray{color:#606060}
352 .gray-background{background:#7d7d7d}
353 .green{color:#006000}
354 .green-background{background:#007d00}
355 .lime{color:#00bf00}
356 .lime-background{background:#00fa00}
357 .maroon{color:#600000}
358 .maroon-background{background:#7d0000}
359 .navy{color:#000060}
360 .navy-background{background:#00007d}
361 .olive{color:#606000}
362 .olive-background{background:#7d7d00}
363 .purple{color:#600060}
364 .purple-background{background:#7d007d}
365 .red{color:#bf0000}
366 .red-background{background:#fa0000}
367 .silver{color:#909090}
368 .silver-background{background:#bcbcbc}
369 .teal{color:#006060}
370 .teal-background{background:#007d7d}
371 .white{color:#bfbfbf}
372 .white-background{background:#fafafa}
373 .yellow{color:#bfbf00}
374 .yellow-background{background:#fafa00}
375 span.icon>.fa{cursor:default}
376 a span.icon>.fa{cursor:inherit}
377 .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
378 .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
379 .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
380 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
381 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
382 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
383 .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}
384 .conum[data-value] *{color:#fff!important}
385 .conum[data-value]+b{display:none}
386 .conum[data-value]::after{content:attr(data-value)}
387 pre .conum[data-value]{position:relative;top:-.125em}
388 b.conum *{color:inherit!important}
389 .conum:not([data-value]):empty{display:none}
390 dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
391 h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
392 p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
393 p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
394 p{margin-bottom:1.25rem}
395 .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
396 .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
397 .print-only{display:none!important}
398 @page{margin:1.25cm .75cm}
399 @media print{*{box-shadow:none!important;text-shadow:none!important}
400 html{font-size:80%}
401 a{color:inherit!important;text-decoration:underline!important}
402 a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
403 a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
404 abbr[title]{border-bottom:1px dotted}
405 abbr[title]::after{content:" (" attr(title) ")"}
406 pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
407 thead{display:table-header-group}
408 svg{max-width:100%}
409 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
410 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
411 #header,#content,#footnotes,#footer{max-width:none}
412 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
413 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
414 body.book #header{text-align:center}
415 body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
416 body.book #header .details{border:0!important;display:block;padding:0!important}
417 body.book #header .details span:first-child{margin-left:0!important}
418 body.book #header .details br{display:block}
419 body.book #header .details br+span::before{content:none!important}
420 body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
421 body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
422 .listingblock code[data-lang]::before{display:block}
423 #footer{padding:0 .9375em}
424 .hide-on-print{display:none!important}
425 .print-only{display:block!important}
426 .hide-for-print{display:none!important}
427 .show-for-print{display:inherit!important}}
428 @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
429 .sect1{padding:0!important}
430 .sect1+.sect1{border:0}
431 #footer{background:none}
432 #footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
433 @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
434 </style>
435 <style>
436 pre>code {
437 display: inline;
439 </style>
440 </head>
441 <body class="manpage">
442 <div id="header">
443 <h1>gittutorial-2(7) Manual Page</h1>
444 <h2 id="_name">NAME</h2>
445 <div class="sectionbody">
446 <p>gittutorial-2 - A tutorial introduction to Git: part two</p>
447 </div>
448 </div>
449 <div id="content">
450 <div class="sect1">
451 <h2 id="_synopsis">SYNOPSIS</h2>
452 <div class="sectionbody">
453 <div class="verseblock">
454 <pre class="content">git *</pre>
455 </div>
456 </div>
457 </div>
458 <div class="sect1">
459 <h2 id="_description">DESCRIPTION</h2>
460 <div class="sectionbody">
461 <div class="paragraph">
462 <p>You should work through <a href="gittutorial.html">gittutorial(7)</a> before reading this tutorial.</p>
463 </div>
464 <div class="paragraph">
465 <p>The goal of this tutorial is to introduce two fundamental pieces of
466 Git&#8217;s architecture&#8212;&#8203;the object database and the index file&#8212;&#8203;and to
467 provide the reader with everything necessary to understand the rest
468 of the Git documentation.</p>
469 </div>
470 </div>
471 </div>
472 <div class="sect1">
473 <h2 id="_the_git_object_database">The Git object database</h2>
474 <div class="sectionbody">
475 <div class="paragraph">
476 <p>Let&#8217;s start a new project and create a small amount of history:</p>
477 </div>
478 <div class="listingblock">
479 <div class="content">
480 <pre>$ mkdir test-project
481 $ cd test-project
482 $ git init
483 Initialized empty Git repository in .git/
484 $ echo 'hello world' &gt; file.txt
485 $ git add .
486 $ git commit -a -m "initial commit"
487 [master (root-commit) 54196cc] initial commit
488 1 file changed, 1 insertion(+)
489 create mode 100644 file.txt
490 $ echo 'hello world!' &gt;file.txt
491 $ git commit -a -m "add emphasis"
492 [master c4d59f3] add emphasis
493 1 file changed, 1 insertion(+), 1 deletion(-)</pre>
494 </div>
495 </div>
496 <div class="paragraph">
497 <p>What are the 7 digits of hex that Git responded to the commit with?</p>
498 </div>
499 <div class="paragraph">
500 <p>We saw in part one of the tutorial that commits have names like this.
501 It turns out that every object in the Git history is stored under
502 a 40-digit hex name. That name is the SHA-1 hash of the object&#8217;s
503 contents; among other things, this ensures that Git will never store
504 the same data twice (since identical data is given an identical SHA-1
505 name), and that the contents of a Git object will never change (since
506 that would change the object&#8217;s name as well). The 7 char hex strings
507 here are simply the abbreviation of such 40 character long strings.
508 Abbreviations can be used everywhere where the 40 character strings
509 can be used, so long as they are unambiguous.</p>
510 </div>
511 <div class="paragraph">
512 <p>It is expected that the content of the commit object you created while
513 following the example above generates a different SHA-1 hash than
514 the one shown above because the commit object records the time when
515 it was created and the name of the person performing the commit.</p>
516 </div>
517 <div class="paragraph">
518 <p>We can ask Git about this particular object with the <code>cat-file</code>
519 command. Don&#8217;t copy the 40 hex digits from this example but use those
520 from your own version. Note that you can shorten it to only a few
521 characters to save yourself typing all 40 hex digits:</p>
522 </div>
523 <div class="listingblock">
524 <div class="content">
525 <pre>$ git cat-file -t 54196cc2
526 commit
527 $ git cat-file commit 54196cc2
528 tree 92b8b694ffb1675e5975148e1121810081dbdffe
529 author J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500
530 committer J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500
532 initial commit</pre>
533 </div>
534 </div>
535 <div class="paragraph">
536 <p>A tree can refer to one or more "blob" objects, each corresponding to
537 a file. In addition, a tree can also refer to other tree objects,
538 thus creating a directory hierarchy. You can examine the contents of
539 any tree using ls-tree (remember that a long enough initial portion
540 of the SHA-1 will also work):</p>
541 </div>
542 <div class="listingblock">
543 <div class="content">
544 <pre>$ git ls-tree 92b8b694
545 100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</pre>
546 </div>
547 </div>
548 <div class="paragraph">
549 <p>Thus we see that this tree has one file in it. The SHA-1 hash is a
550 reference to that file&#8217;s data:</p>
551 </div>
552 <div class="listingblock">
553 <div class="content">
554 <pre>$ git cat-file -t 3b18e512
555 blob</pre>
556 </div>
557 </div>
558 <div class="paragraph">
559 <p>A "blob" is just file data, which we can also examine with cat-file:</p>
560 </div>
561 <div class="listingblock">
562 <div class="content">
563 <pre>$ git cat-file blob 3b18e512
564 hello world</pre>
565 </div>
566 </div>
567 <div class="paragraph">
568 <p>Note that this is the old file data; so the object that Git named in
569 its response to the initial tree was a tree with a snapshot of the
570 directory state that was recorded by the first commit.</p>
571 </div>
572 <div class="paragraph">
573 <p>All of these objects are stored under their SHA-1 names inside the Git
574 directory:</p>
575 </div>
576 <div class="listingblock">
577 <div class="content">
578 <pre>$ find .git/objects/
579 .git/objects/
580 .git/objects/pack
581 .git/objects/info
582 .git/objects/3b
583 .git/objects/3b/18e512dba79e4c8300dd08aeb37f8e728b8dad
584 .git/objects/92
585 .git/objects/92/b8b694ffb1675e5975148e1121810081dbdffe
586 .git/objects/54
587 .git/objects/54/196cc2703dc165cbd373a65a4dcf22d50ae7f7
588 .git/objects/a0
589 .git/objects/a0/423896973644771497bdc03eb99d5281615b51
590 .git/objects/d0
591 .git/objects/d0/492b368b66bdabf2ac1fd8c92b39d3db916e59
592 .git/objects/c4
593 .git/objects/c4/d59f390b9cfd4318117afde11d601c1085f241</pre>
594 </div>
595 </div>
596 <div class="paragraph">
597 <p>and the contents of these files is just the compressed data plus a
598 header identifying their length and their type. The type is either a
599 blob, a tree, a commit, or a tag.</p>
600 </div>
601 <div class="paragraph">
602 <p>The simplest commit to find is the HEAD commit, which we can find
603 from .git/HEAD:</p>
604 </div>
605 <div class="listingblock">
606 <div class="content">
607 <pre>$ cat .git/HEAD
608 ref: refs/heads/master</pre>
609 </div>
610 </div>
611 <div class="paragraph">
612 <p>As you can see, this tells us which branch we&#8217;re currently on, and it
613 tells us this by naming a file under the .git directory, which itself
614 contains a SHA-1 name referring to a commit object, which we can
615 examine with cat-file:</p>
616 </div>
617 <div class="listingblock">
618 <div class="content">
619 <pre>$ cat .git/refs/heads/master
620 c4d59f390b9cfd4318117afde11d601c1085f241
621 $ git cat-file -t c4d59f39
622 commit
623 $ git cat-file commit c4d59f39
624 tree d0492b368b66bdabf2ac1fd8c92b39d3db916e59
625 parent 54196cc2703dc165cbd373a65a4dcf22d50ae7f7
626 author J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143418702 -0500
627 committer J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143418702 -0500
629 add emphasis</pre>
630 </div>
631 </div>
632 <div class="paragraph">
633 <p>The "tree" object here refers to the new state of the tree:</p>
634 </div>
635 <div class="listingblock">
636 <div class="content">
637 <pre>$ git ls-tree d0492b36
638 100644 blob a0423896973644771497bdc03eb99d5281615b51 file.txt
639 $ git cat-file blob a0423896
640 hello world!</pre>
641 </div>
642 </div>
643 <div class="paragraph">
644 <p>and the "parent" object refers to the previous commit:</p>
645 </div>
646 <div class="listingblock">
647 <div class="content">
648 <pre>$ git cat-file commit 54196cc2
649 tree 92b8b694ffb1675e5975148e1121810081dbdffe
650 author J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500
651 committer J. Bruce Fields &lt;bfields@puzzle.fieldses.org&gt; 1143414668 -0500
653 initial commit</pre>
654 </div>
655 </div>
656 <div class="paragraph">
657 <p>The tree object is the tree we examined first, and this commit is
658 unusual in that it lacks any parent.</p>
659 </div>
660 <div class="paragraph">
661 <p>Most commits have only one parent, but it is also common for a commit
662 to have multiple parents. In that case the commit represents a
663 merge, with the parent references pointing to the heads of the merged
664 branches.</p>
665 </div>
666 <div class="paragraph">
667 <p>Besides blobs, trees, and commits, the only remaining type of object
668 is a "tag", which we won&#8217;t discuss here; refer to <a href="git-tag.html">git-tag(1)</a>
669 for details.</p>
670 </div>
671 <div class="paragraph">
672 <p>So now we know how Git uses the object database to represent a
673 project&#8217;s history:</p>
674 </div>
675 <div class="ulist">
676 <ul>
677 <li>
678 <p>"commit" objects refer to "tree" objects representing the
679 snapshot of a directory tree at a particular point in the
680 history, and refer to "parent" commits to show how they&#8217;re
681 connected into the project history.</p>
682 </li>
683 <li>
684 <p>"tree" objects represent the state of a single directory,
685 associating directory names to "blob" objects containing file
686 data and "tree" objects containing subdirectory information.</p>
687 </li>
688 <li>
689 <p>"blob" objects contain file data without any other structure.</p>
690 </li>
691 <li>
692 <p>References to commit objects at the head of each branch are
693 stored in files under .git/refs/heads/.</p>
694 </li>
695 <li>
696 <p>The name of the current branch is stored in .git/HEAD.</p>
697 </li>
698 </ul>
699 </div>
700 <div class="paragraph">
701 <p>Note, by the way, that lots of commands take a tree as an argument.
702 But as we can see above, a tree can be referred to in many different
703 ways&#8212;&#8203;by the SHA-1 name for that tree, by the name of a commit that
704 refers to the tree, by the name of a branch whose head refers to that
705 tree, etc.--and most such commands can accept any of these names.</p>
706 </div>
707 <div class="paragraph">
708 <p>In command synopses, the word "tree-ish" is sometimes used to
709 designate such an argument.</p>
710 </div>
711 </div>
712 </div>
713 <div class="sect1">
714 <h2 id="_the_index_file">The index file</h2>
715 <div class="sectionbody">
716 <div class="paragraph">
717 <p>The primary tool we&#8217;ve been using to create commits is <code>git-commit</code>
718 <code>-a</code>, which creates a commit including every change you&#8217;ve made to
719 your working tree. But what if you want to commit changes only to
720 certain files? Or only certain changes to certain files?</p>
721 </div>
722 <div class="paragraph">
723 <p>If we look at the way commits are created under the cover, we&#8217;ll see
724 that there are more flexible ways creating commits.</p>
725 </div>
726 <div class="paragraph">
727 <p>Continuing with our test-project, let&#8217;s modify file.txt again:</p>
728 </div>
729 <div class="listingblock">
730 <div class="content">
731 <pre>$ echo "hello world, again" &gt;&gt;file.txt</pre>
732 </div>
733 </div>
734 <div class="paragraph">
735 <p>but this time instead of immediately making the commit, let&#8217;s take an
736 intermediate step, and ask for diffs along the way to keep track of
737 what&#8217;s happening:</p>
738 </div>
739 <div class="listingblock">
740 <div class="content">
741 <pre>$ git diff
742 --- a/file.txt
743 +++ b/file.txt
744 @@ -1 +1,2 @@
745 hello world!
746 +hello world, again
747 $ git add file.txt
748 $ git diff</pre>
749 </div>
750 </div>
751 <div class="paragraph">
752 <p>The last diff is empty, but no new commits have been made, and the
753 head still doesn&#8217;t contain the new line:</p>
754 </div>
755 <div class="listingblock">
756 <div class="content">
757 <pre>$ git diff HEAD
758 diff --git a/file.txt b/file.txt
759 index a042389..513feba 100644
760 --- a/file.txt
761 +++ b/file.txt
762 @@ -1 +1,2 @@
763 hello world!
764 +hello world, again</pre>
765 </div>
766 </div>
767 <div class="paragraph">
768 <p>So <em>git diff</em> is comparing against something other than the head.
769 The thing that it&#8217;s comparing against is actually the index file,
770 which is stored in .git/index in a binary format, but whose contents
771 we can examine with ls-files:</p>
772 </div>
773 <div class="listingblock">
774 <div class="content">
775 <pre>$ git ls-files --stage
776 100644 513feba2e53ebbd2532419ded848ba19de88ba00 0 file.txt
777 $ git cat-file -t 513feba2
778 blob
779 $ git cat-file blob 513feba2
780 hello world!
781 hello world, again</pre>
782 </div>
783 </div>
784 <div class="paragraph">
785 <p>So what our <em>git add</em> did was store a new blob and then put
786 a reference to it in the index file. If we modify the file again,
787 we&#8217;ll see that the new modifications are reflected in the <em>git diff</em>
788 output:</p>
789 </div>
790 <div class="listingblock">
791 <div class="content">
792 <pre>$ echo 'again?' &gt;&gt;file.txt
793 $ git diff
794 index 513feba..ba3da7b 100644
795 --- a/file.txt
796 +++ b/file.txt
797 @@ -1,2 +1,3 @@
798 hello world!
799 hello world, again
800 +again?</pre>
801 </div>
802 </div>
803 <div class="paragraph">
804 <p>With the right arguments, <em>git diff</em> can also show us the difference
805 between the working directory and the last commit, or between the
806 index and the last commit:</p>
807 </div>
808 <div class="listingblock">
809 <div class="content">
810 <pre>$ git diff HEAD
811 diff --git a/file.txt b/file.txt
812 index a042389..ba3da7b 100644
813 --- a/file.txt
814 +++ b/file.txt
815 @@ -1 +1,3 @@
816 hello world!
817 +hello world, again
818 +again?
819 $ git diff --cached
820 diff --git a/file.txt b/file.txt
821 index a042389..513feba 100644
822 --- a/file.txt
823 +++ b/file.txt
824 @@ -1 +1,2 @@
825 hello world!
826 +hello world, again</pre>
827 </div>
828 </div>
829 <div class="paragraph">
830 <p>At any time, we can create a new commit using <em>git commit</em> (without
831 the "-a" option), and verify that the state committed only includes the
832 changes stored in the index file, not the additional change that is
833 still only in our working tree:</p>
834 </div>
835 <div class="listingblock">
836 <div class="content">
837 <pre>$ git commit -m "repeat"
838 $ git diff HEAD
839 diff --git a/file.txt b/file.txt
840 index 513feba..ba3da7b 100644
841 --- a/file.txt
842 +++ b/file.txt
843 @@ -1,2 +1,3 @@
844 hello world!
845 hello world, again
846 +again?</pre>
847 </div>
848 </div>
849 <div class="paragraph">
850 <p>So by default <em>git commit</em> uses the index to create the commit, not
851 the working tree; the "-a" option to commit tells it to first update
852 the index with all changes in the working tree.</p>
853 </div>
854 <div class="paragraph">
855 <p>Finally, it&#8217;s worth looking at the effect of <em>git add</em> on the index
856 file:</p>
857 </div>
858 <div class="listingblock">
859 <div class="content">
860 <pre>$ echo "goodbye, world" &gt;closing.txt
861 $ git add closing.txt</pre>
862 </div>
863 </div>
864 <div class="paragraph">
865 <p>The effect of the <em>git add</em> was to add one entry to the index file:</p>
866 </div>
867 <div class="listingblock">
868 <div class="content">
869 <pre>$ git ls-files --stage
870 100644 8b9743b20d4b15be3955fc8d5cd2b09cd2336138 0 closing.txt
871 100644 513feba2e53ebbd2532419ded848ba19de88ba00 0 file.txt</pre>
872 </div>
873 </div>
874 <div class="paragraph">
875 <p>And, as you can see with cat-file, this new entry refers to the
876 current contents of the file:</p>
877 </div>
878 <div class="listingblock">
879 <div class="content">
880 <pre>$ git cat-file blob 8b9743b2
881 goodbye, world</pre>
882 </div>
883 </div>
884 <div class="paragraph">
885 <p>The "status" command is a useful way to get a quick summary of the
886 situation:</p>
887 </div>
888 <div class="listingblock">
889 <div class="content">
890 <pre>$ git status
891 On branch master
892 Changes to be committed:
893 (use "git restore --staged &lt;file&gt;..." to unstage)
895 new file: closing.txt
897 Changes not staged for commit:
898 (use "git add &lt;file&gt;..." to update what will be committed)
899 (use "git restore &lt;file&gt;..." to discard changes in working directory)
901 modified: file.txt</pre>
902 </div>
903 </div>
904 <div class="paragraph">
905 <p>Since the current state of closing.txt is cached in the index file,
906 it is listed as "Changes to be committed". Since file.txt has
907 changes in the working directory that aren&#8217;t reflected in the index,
908 it is marked "changed but not updated". At this point, running "git
909 commit" would create a commit that added closing.txt (with its new
910 contents), but that didn&#8217;t modify file.txt.</p>
911 </div>
912 <div class="paragraph">
913 <p>Also, note that a bare <code>git</code> <code>diff</code> shows the changes to file.txt, but
914 not the addition of closing.txt, because the version of closing.txt
915 in the index file is identical to the one in the working directory.</p>
916 </div>
917 <div class="paragraph">
918 <p>In addition to being the staging area for new commits, the index file
919 is also populated from the object database when checking out a
920 branch, and is used to hold the trees involved in a merge operation.
921 See <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> and the relevant man
922 pages for details.</p>
923 </div>
924 </div>
925 </div>
926 <div class="sect1">
927 <h2 id="_what_next">What next?</h2>
928 <div class="sectionbody">
929 <div class="paragraph">
930 <p>At this point you should know everything necessary to read the man
931 pages for any of the git commands; one good place to start would be
932 with the commands mentioned in <a href="giteveryday.html">giteveryday(7)</a>. You
933 should be able to find any unknown jargon in <a href="gitglossary.html">gitglossary(7)</a>.</p>
934 </div>
935 <div class="paragraph">
936 <p>The <a href="user-manual.html">Git User&#8217;s Manual</a> provides a more
937 comprehensive introduction to Git.</p>
938 </div>
939 <div class="paragraph">
940 <p><a href="gitcvs-migration.html">gitcvs-migration(7)</a> explains how to
941 import a CVS repository into Git, and shows how to use Git in a
942 CVS-like way.</p>
943 </div>
944 <div class="paragraph">
945 <p>For some interesting examples of Git use, see the
946 <a href="howto-index.html">howtos</a>.</p>
947 </div>
948 <div class="paragraph">
949 <p>For Git developers, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a> goes
950 into detail on the lower-level Git mechanisms involved in, for
951 example, creating a new commit.</p>
952 </div>
953 </div>
954 </div>
955 <div class="sect1">
956 <h2 id="_see_also">SEE ALSO</h2>
957 <div class="sectionbody">
958 <div class="paragraph">
959 <p><a href="gittutorial.html">gittutorial(7)</a>,
960 <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,
961 <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,
962 <a href="gitglossary.html">gitglossary(7)</a>,
963 <a href="git-help.html">git-help(1)</a>,
964 <a href="giteveryday.html">giteveryday(7)</a>,
965 <a href="user-manual.html">The Git User&#8217;s Manual</a></p>
966 </div>
967 </div>
968 </div>
969 <div class="sect1">
970 <h2 id="_git">GIT</h2>
971 <div class="sectionbody">
972 <div class="paragraph">
973 <p>Part of the <a href="git.html">git(1)</a> suite</p>
974 </div>
975 </div>
976 </div>
977 </div>
978 <div id="footer">
979 <div id="footer-text">
980 Last updated 2020-03-10 15:02:33 -0700
981 </div>
982 </div>
983 </body>
984 </html>