Google Git
Sign in
chromium / external / gitster / git-htmldocs / d6a33e4b822c815c22685a393ba620e9301f7ceb / . / gittutorial.html
blob: 1055f767aef220b7bcb8c44660c906d27d5dd0c8 [file] [log] [blame]
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]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"/>
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame^]7<meta name="generator" content="Asciidoctor 2.0.23"/>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]8<title>gittutorial(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"; */
14html{font-family:sans-serif;-webkit-text-size-adjust:100%}
15a{background:none}
16a:focus{outline:thin dotted}
17a:active,a:hover{outline:0}
18h1{font-size:2em;margin:.67em 0}
19b,strong{font-weight:bold}
20abbr{font-size:.9em}
21abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
22dfn{font-style:italic}
23hr{height:0}
24mark{background:#ff0;color:#000}
25code,kbd,pre,samp{font-family:monospace;font-size:1em}
26pre{white-space:pre-wrap}
27q{quotes:"\201C" "\201D" "\2018" "\2019"}
28small{font-size:80%}
29sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
30sup{top:-.5em}
31sub{bottom:-.25em}
32img{border:0}
33svg:not(:root){overflow:hidden}
34figure{margin:0}
35audio,video{display:inline-block}
36audio:not([controls]){display:none;height:0}
37fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
38legend{border:0;padding:0}
39button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
40button,input{line-height:normal}
41button,select{text-transform:none}
42button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
43button[disabled],html input[disabled]{cursor:default}
44input[type=checkbox],input[type=radio]{padding:0}
45button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
46textarea{overflow:auto;vertical-align:top}
47table{border-collapse:collapse;border-spacing:0}
48*,::before,::after{box-sizing:border-box}
49html,body{font-size:100%}
50body{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}
51a:hover{cursor:pointer}
52img,object,embed{max-width:100%;height:auto}
53object,embed{height:100%}
54img{-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}
62img,object,svg{display:inline-block;vertical-align:middle}
63textarea{height:auto;min-height:50px}
64select{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}
66div,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}
67a{color:#2156a5;text-decoration:underline;line-height:inherit}
68a:hover,a:focus{color:#1d4b8f}
69a img{border:0}
70p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
71p aside{font-size:.875em;line-height:1.35;font-style:italic}
72h1,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}
73h1 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}
74h1{font-size:2.125em}
75h2{font-size:1.6875em}
76h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
77h4,h5{font-size:1.125em}
78h6{font-size:1em}
79hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
80em,i{font-style:italic;line-height:inherit}
81strong,b{font-weight:bold;line-height:inherit}
82small{font-size:60%;line-height:inherit}
83code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
84ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
85ul,ol{margin-left:1.5em}
86ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
87ul.circle{list-style-type:circle}
88ul.disc{list-style-type:disc}
89ul.square{list-style-type:square}
90ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
91ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
92dl dt{margin-bottom:.3125em;font-weight:bold}
93dl dd{margin-bottom:1.25em}
94blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
95blockquote,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}
97h1{font-size:2.75em}
98h2{font-size:2.3125em}
99h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
100h4{font-size:1.4375em}}
101table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
102table thead,table tfoot{background:#f7f8f7}
103table 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}
104table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
105table tr.even,table tr.alt{background:#f8f8f7}
106table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
107h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
108h1 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}
117pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
118pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
119pre>code{display:block}
120pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
121em em{font-style:normal}
122strong strong{font-weight:400}
123.keyseq{color:rgba(51,51,51,.8)}
124kbd{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}
132b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
133b.button::before{content:"[";padding:0 3px 0 2px}
134b.button::after{content:"]";padding:0 2px 0 3px}
135p 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}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame^]143#header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]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}
164body.toc2{padding-left:15em;padding-right:0}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame^]165body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]166#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}
167#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
168#toc.toc2>ul{font-size:.9em;margin-bottom:0}
169#toc.toc2 ul ul{margin-left:0;padding-left:1em}
170#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
171body.toc2.toc-right{padding-left:0;padding-right:15em}
172body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
173@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
174#toc.toc2{width:20em}
175#toc.toc2 #toctitle{font-size:1.375em}
176#toc.toc2>ul{font-size:.95em}
177#toc.toc2 ul ul{padding-left:1.25em}
178body.toc2.toc-right{padding-left:0;padding-right:20em}}
179#content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
180#content #toc>:first-child{margin-top:0}
181#content #toc>:last-child{margin-bottom:0}
182#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
183#footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
184#content{margin-bottom:.625em}
185.sect1{padding-bottom:.625em}
186@media screen and (min-width:768px){#content{margin-bottom:1.25em}
187.sect1{padding-bottom:1.25em}}
188.sect1:last-child{padding-bottom:0}
189.sect1+.sect1{border-top:1px solid #e7e7e9}
190#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}
191#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}
192#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}
193#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}
194#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}
195details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
196details{margin-left:1.25rem}
197details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
198details>summary::-webkit-details-marker{display:none}
199details>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%)}
200details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
201details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
202.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}
203table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
204.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)}
205.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
206.admonitionblock>table td.icon{text-align:center;width:80px}
207.admonitionblock>table td.icon img{max-width:none}
208.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
209.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}
210.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
211.exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
212.sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
213.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
214.exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
215.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}
216.literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
217@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
218@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
219.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
220.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
221.listingblock>.content{position:relative}
222.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}
223.listingblock:hover code[data-lang]::before{display:block}
224.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
225.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
226.listingblock pre.highlightjs{padding:0}
227.listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
228.listingblock pre.prettyprint{border-width:0}
229.prettyprint{background:#f7f7f8}
230pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
231pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
232pre.prettyprint li code[data-lang]::before{opacity:1}
233pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
234table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
235table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
236table.linenotable td.code{padding-left:.75em}
237table.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}
238pre.pygments span.linenos{display:inline-block;margin-right:.75em}
239.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
240.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
241.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}
242.quoteblock blockquote{margin:0;padding:0;border:0}
243.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)}
244.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
245.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
246.verseblock{margin:0 1em 1.25em}
247.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}
248.verseblock pre strong{font-weight:400}
249.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
250.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
251.quoteblock .attribution br,.verseblock .attribution br{display:none}
252.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
253.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
254.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}
255.quoteblock.abstract{margin:0 1em 1.25em;display:block}
256.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
257.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
258.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
259.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
260.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
261p.tableblock:last-child{margin-bottom:0}
262td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
263td.tableblock>.content>:last-child{margin-bottom:-1.25em}
264table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
265table.grid-all>*>tr>*{border-width:1px}
266table.grid-cols>*>tr>*{border-width:0 1px}
267table.grid-rows>*>tr>*{border-width:1px 0}
268table.frame-all{border-width:1px}
269table.frame-ends{border-width:1px 0}
270table.frame-sides{border-width:0 1px}
271table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
272table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
273table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
274table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
275table.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}
276th.halign-left,td.halign-left{text-align:left}
277th.halign-right,td.halign-right{text-align:right}
278th.halign-center,td.halign-center{text-align:center}
279th.valign-top,td.valign-top{vertical-align:top}
280th.valign-bottom,td.valign-bottom{vertical-align:bottom}
281th.valign-middle,td.valign-middle{vertical-align:middle}
282table thead th,table tfoot th{font-weight:bold}
283tbody tr th{background:#f7f8f7}
284tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
285p.tableblock>code:only-child{background:none;padding:0}
286p.tableblock{font-size:1em}
287ol{margin-left:1.75em}
288ul li ol{margin-left:1.5em}
289dl dd{margin-left:1.125em}
290dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
291li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
292ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
293ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
294ul.unstyled,ol.unstyled{margin-left:0}
295li>p:empty:only-child::before{content:"";display:inline-block}
296ul.checklist>li>p:first-child{margin-left:-1em}
297ul.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}
298ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
299ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
300ul.inline>li{margin-left:1.25em}
301.unstyled dl dt{font-weight:400;font-style:normal}
302ol.arabic{list-style-type:decimal}
303ol.decimal{list-style-type:decimal-leading-zero}
304ol.loweralpha{list-style-type:lower-alpha}
305ol.upperalpha{list-style-type:upper-alpha}
306ol.lowerroman{list-style-type:lower-roman}
307ol.upperroman{list-style-type:upper-roman}
308ol.lowergreek{list-style-type:lower-greek}
309.hdlist>table,.colist>table{border:0;background:none}
310.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
311td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
312td.hdlist1{font-weight:bold;padding-bottom:1.25em}
313td.hdlist2{word-wrap:anywhere}
314.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
315.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
316.colist td:not([class]):first-child img{max-width:none}
317.colist td:not([class]):last-child{padding:.25em 0}
318.thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
319.imageblock.left{margin:.25em .625em 1.25em 0}
320.imageblock.right{margin:.25em 0 1.25em .625em}
321.imageblock>.title{margin-bottom:0}
322.imageblock.thumb,.imageblock.th{border-width:6px}
323.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
324.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
325.image.left{margin-right:.625em}
326.image.right{margin-left:.625em}
327a.image{text-decoration:none;display:inline-block}
328a.image object{pointer-events:none}
329sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
330sup.footnote a,sup.footnoteref a{text-decoration:none}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame^]331sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]332#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
333#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
334#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
335#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
336#footnotes .footnote:last-of-type{margin-bottom:0}
337#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
338div.unbreakable{page-break-inside:avoid}
339.big{font-size:larger}
340.small{font-size:smaller}
341.underline{text-decoration:underline}
342.overline{text-decoration:overline}
343.line-through{text-decoration:line-through}
344.aqua{color:#00bfbf}
345.aqua-background{background:#00fafa}
346.black{color:#000}
347.black-background{background:#000}
348.blue{color:#0000bf}
349.blue-background{background:#0000fa}
350.fuchsia{color:#bf00bf}
351.fuchsia-background{background:#fa00fa}
352.gray{color:#606060}
353.gray-background{background:#7d7d7d}
354.green{color:#006000}
355.green-background{background:#007d00}
356.lime{color:#00bf00}
357.lime-background{background:#00fa00}
358.maroon{color:#600000}
359.maroon-background{background:#7d0000}
360.navy{color:#000060}
361.navy-background{background:#00007d}
362.olive{color:#606000}
363.olive-background{background:#7d7d00}
364.purple{color:#600060}
365.purple-background{background:#7d007d}
366.red{color:#bf0000}
367.red-background{background:#fa0000}
368.silver{color:#909090}
369.silver-background{background:#bcbcbc}
370.teal{color:#006060}
371.teal-background{background:#007d7d}
372.white{color:#bfbfbf}
373.white-background{background:#fafafa}
374.yellow{color:#bfbf00}
375.yellow-background{background:#fafa00}
376span.icon>.fa{cursor:default}
377a span.icon>.fa{cursor:inherit}
378.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
379.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
380.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
381.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
382.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
383.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
384.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}
385.conum[data-value] *{color:#fff!important}
386.conum[data-value]+b{display:none}
387.conum[data-value]::after{content:attr(data-value)}
388pre .conum[data-value]{position:relative;top:-.125em}
389b.conum *{color:inherit!important}
390.conum:not([data-value]):empty{display:none}
391dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
392h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
393p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
394p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
395p{margin-bottom:1.25rem}
396.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
397.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
398.print-only{display:none!important}
399@page{margin:1.25cm .75cm}
400@media print{*{box-shadow:none!important;text-shadow:none!important}
401html{font-size:80%}
402a{color:inherit!important;text-decoration:underline!important}
403a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
404a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
405abbr[title]{border-bottom:1px dotted}
406abbr[title]::after{content:" (" attr(title) ")"}
407pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
408thead{display:table-header-group}
409svg{max-width:100%}
410p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
411h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
412#header,#content,#footnotes,#footer{max-width:none}
413#toc,.sidebarblock,.exampleblock>.content{background:none!important}
414#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
415body.book #header{text-align:center}
416body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
417body.book #header .details{border:0!important;display:block;padding:0!important}
418body.book #header .details span:first-child{margin-left:0!important}
419body.book #header .details br{display:block}
420body.book #header .details br+span::before{content:none!important}
421body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
422body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
423.listingblock code[data-lang]::before{display:block}
424#footer{padding:0 .9375em}
425.hide-on-print{display:none!important}
426.print-only{display:block!important}
427.hide-for-print{display:none!important}
428.show-for-print{display:inherit!important}}
429@media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
430.sect1{padding:0!important}
431.sect1+.sect1{border:0}
432#footer{background:none}
433#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
434@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
435</style>
436<style>
437pre>code {
438 display: inline;
439}
440</style>
441</head>
442<body class="manpage">
443<div id="header">
444<h1>gittutorial(7) Manual Page</h1>
445<h2 id="_name">NAME</h2>
446<div class="sectionbody">
447<p>gittutorial - A tutorial introduction to Git</p>
448</div>
449</div>
450<div id="content">
451<div class="sect1">
452<h2 id="_synopsis">SYNOPSIS</h2>
453<div class="sectionbody">
454<div class="verseblock">
455<pre class="content">git *</pre>
456</div>
457</div>
458</div>
459<div class="sect1">
460<h2 id="_description">DESCRIPTION</h2>
461<div class="sectionbody">
462<div class="paragraph">
463<p>This tutorial explains how to import a new project into Git, make
464changes to it, and share changes with other developers.</p>
465</div>
466<div class="paragraph">
467<p>If you are instead primarily interested in using Git to fetch a project,
468for example, to test the latest version, you may prefer to start with
469the first two chapters of <a href="user-manual.html">The Git User&#8217;s Manual</a>.</p>
470</div>
471<div class="paragraph">
472<p>First, note that you can get documentation for a command such as
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]473<code>git</code> <code>log</code> <code>--graph</code> with:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]474</div>
475<div class="listingblock">
476<div class="content">
477<pre>$ man git-log</pre>
478</div>
479</div>
480<div class="paragraph">
481<p>or:</p>
482</div>
483<div class="listingblock">
484<div class="content">
485<pre>$ git help log</pre>
486</div>
487</div>
488<div class="paragraph">
489<p>With the latter, you can use the manual viewer of your choice; see
490<a href="git-help.html">git-help(1)</a> for more information.</p>
491</div>
492<div class="paragraph">
493<p>It is a good idea to introduce yourself to Git with your name and
494public email address before doing any operation. The easiest
495way to do so is:</p>
496</div>
497<div class="listingblock">
498<div class="content">
499<pre>$ git config --global user.name "Your Name Comes Here"
500$ git config --global user.email you@yourdomain.example.com</pre>
501</div>
502</div>
503</div>
504</div>
505<div class="sect1">
506<h2 id="_importing_a_new_project">Importing a new project</h2>
507<div class="sectionbody">
508<div class="paragraph">
509<p>Assume you have a tarball <code>project.tar.gz</code> with your initial work. You
510can place it under Git revision control as follows.</p>
511</div>
512<div class="listingblock">
513<div class="content">
514<pre>$ tar xzf project.tar.gz
515$ cd project
516$ git init</pre>
517</div>
518</div>
519<div class="paragraph">
520<p>Git will reply</p>
521</div>
522<div class="listingblock">
523<div class="content">
524<pre>Initialized empty Git repository in .git/</pre>
525</div>
526</div>
527<div class="paragraph">
528<p>You&#8217;ve now initialized the working directory&#8212;&#8203;you may notice a new
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]529directory created, named .<code>git</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]530</div>
531<div class="paragraph">
532<p>Next, tell Git to take a snapshot of the contents of all files under the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]533current directory (note the .), with <code>git</code> <code>add</code>:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]534</div>
535<div class="listingblock">
536<div class="content">
537<pre>$ git add .</pre>
538</div>
539</div>
540<div class="paragraph">
541<p>This snapshot is now stored in a temporary staging area which Git calls
542the "index". You can permanently store the contents of the index in the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]543repository with <code>git</code> <code>commit</code>:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]544</div>
545<div class="listingblock">
546<div class="content">
547<pre>$ git commit</pre>
548</div>
549</div>
550<div class="paragraph">
551<p>This will prompt you for a commit message. You&#8217;ve now stored the first
552version of your project in Git.</p>
553</div>
554</div>
555</div>
556<div class="sect1">
557<h2 id="_making_changes">Making changes</h2>
558<div class="sectionbody">
559<div class="paragraph">
560<p>Modify some files, then add their updated contents to the index:</p>
561</div>
562<div class="listingblock">
563<div class="content">
564<pre>$ git add file1 file2 file3</pre>
565</div>
566</div>
567<div class="paragraph">
568<p>You are now ready to commit. You can see what is about to be committed
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]569using <code>git</code> <code>diff</code> with the <code>--cached</code> option:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]570</div>
571<div class="listingblock">
572<div class="content">
573<pre>$ git diff --cached</pre>
574</div>
575</div>
576<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]577<p>(Without <code>--cached</code>, <code>git</code> <code>diff</code> will show you any changes that
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]578you&#8217;ve made but not yet added to the index.) You can also get a brief
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]579summary of the situation with <code>git</code> <code>status</code>:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]580</div>
581<div class="listingblock">
582<div class="content">
583<pre>$ git status
584On branch master
585Changes to be committed:
586 (use "git restore --staged &lt;file&gt;..." to unstage)
587
588 modified: file1
589 modified: file2
590 modified: file3</pre>
591</div>
592</div>
593<div class="paragraph">
594<p>If you need to make any further adjustments, do so now, and then add any
595newly modified content to the index. Finally, commit your changes with:</p>
596</div>
597<div class="listingblock">
598<div class="content">
599<pre>$ git commit</pre>
600</div>
601</div>
602<div class="paragraph">
603<p>This will again prompt you for a message describing the change, and then
604record a new version of the project.</p>
605</div>
606<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]607<p>Alternatively, instead of running <code>git</code> <code>add</code> beforehand, you can use</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]608</div>
609<div class="listingblock">
610<div class="content">
611<pre>$ git commit -a</pre>
612</div>
613</div>
614<div class="paragraph">
615<p>which will automatically notice any modified (but not new) files, add
616them to the index, and commit, all in one step.</p>
617</div>
618<div class="paragraph">
619<p>A note on commit messages: Though not required, it&#8217;s a good idea to
620begin the commit message with a single short (no more than 50
621characters) line summarizing the change, followed by a blank line and
622then a more thorough description. The text up to the first blank line in
623a commit message is treated as the commit title, and that title is used
624throughout Git. For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a
625commit into email, and it uses the title on the Subject line and the
626rest of the commit in the body.</p>
627</div>
628</div>
629</div>
630<div class="sect1">
631<h2 id="_git_tracks_content_not_files">Git tracks content not files</h2>
632<div class="sectionbody">
633<div class="paragraph">
634<p>Many revision control systems provide an <code>add</code> command that tells the
635system to start tracking changes to a new file. Git&#8217;s <code>add</code> command
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]636does something simpler and more powerful: <code>git</code> <code>add</code> is used both for new
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]637and newly modified files, and in both cases it takes a snapshot of the
638given files and stages that content in the index, ready for inclusion in
639the next commit.</p>
640</div>
641</div>
642</div>
643<div class="sect1">
644<h2 id="_viewing_project_history">Viewing project history</h2>
645<div class="sectionbody">
646<div class="paragraph">
647<p>At any point you can view the history of your changes using</p>
648</div>
649<div class="listingblock">
650<div class="content">
651<pre>$ git log</pre>
652</div>
653</div>
654<div class="paragraph">
655<p>If you also want to see complete diffs at each step, use</p>
656</div>
657<div class="listingblock">
658<div class="content">
659<pre>$ git log -p</pre>
660</div>
661</div>
662<div class="paragraph">
663<p>Often the overview of the change is useful to get a feel of
664each step</p>
665</div>
666<div class="listingblock">
667<div class="content">
668<pre>$ git log --stat --summary</pre>
669</div>
670</div>
671</div>
672</div>
673<div class="sect1">
674<h2 id="_managing_branches">Managing branches</h2>
675<div class="sectionbody">
676<div class="paragraph">
677<p>A single Git repository can maintain multiple branches of
678development. To create a new branch named <code>experimental</code>, use</p>
679</div>
680<div class="listingblock">
681<div class="content">
682<pre>$ git branch experimental</pre>
683</div>
684</div>
685<div class="paragraph">
686<p>If you now run</p>
687</div>
688<div class="listingblock">
689<div class="content">
690<pre>$ git branch</pre>
691</div>
692</div>
693<div class="paragraph">
694<p>you&#8217;ll get a list of all existing branches:</p>
695</div>
696<div class="listingblock">
697<div class="content">
698<pre> experimental
699* master</pre>
700</div>
701</div>
702<div class="paragraph">
703<p>The <code>experimental</code> branch is the one you just created, and the
704<code>master</code> branch is a default branch that was created for you
705automatically. The asterisk marks the branch you are currently on;
706type</p>
707</div>
708<div class="listingblock">
709<div class="content">
710<pre>$ git switch experimental</pre>
711</div>
712</div>
713<div class="paragraph">
714<p>to switch to the <code>experimental</code> branch. Now edit a file, commit the
715change, and switch back to the <code>master</code> branch:</p>
716</div>
717<div class="listingblock">
718<div class="content">
719<pre>(edit file)
720$ git commit -a
721$ git switch master</pre>
722</div>
723</div>
724<div class="paragraph">
725<p>Check that the change you made is no longer visible, since it was
726made on the <code>experimental</code> branch and you&#8217;re back on the <code>master</code> branch.</p>
727</div>
728<div class="paragraph">
729<p>You can make a different change on the <code>master</code> branch:</p>
730</div>
731<div class="listingblock">
732<div class="content">
733<pre>(edit file)
734$ git commit -a</pre>
735</div>
736</div>
737<div class="paragraph">
738<p>at this point the two branches have diverged, with different changes
739made in each. To merge the changes made in <code>experimental</code> into <code>master</code>, run</p>
740</div>
741<div class="listingblock">
742<div class="content">
743<pre>$ git merge experimental</pre>
744</div>
745</div>
746<div class="paragraph">
747<p>If the changes don&#8217;t conflict, you&#8217;re done. If there are conflicts,
748markers will be left in the problematic files showing the conflict;</p>
749</div>
750<div class="listingblock">
751<div class="content">
752<pre>$ git diff</pre>
753</div>
754</div>
755<div class="paragraph">
756<p>will show this. Once you&#8217;ve edited the files to resolve the
757conflicts,</p>
758</div>
759<div class="listingblock">
760<div class="content">
761<pre>$ git commit -a</pre>
762</div>
763</div>
764<div class="paragraph">
765<p>will commit the result of the merge. Finally,</p>
766</div>
767<div class="listingblock">
768<div class="content">
769<pre>$ gitk</pre>
770</div>
771</div>
772<div class="paragraph">
773<p>will show a nice graphical representation of the resulting history.</p>
774</div>
775<div class="paragraph">
776<p>At this point you could delete the <code>experimental</code> branch with</p>
777</div>
778<div class="listingblock">
779<div class="content">
780<pre>$ git branch -d experimental</pre>
781</div>
782</div>
783<div class="paragraph">
784<p>This command ensures that the changes in the <code>experimental</code> branch are
785already in the current branch.</p>
786</div>
787<div class="paragraph">
788<p>If you develop on a branch <code>crazy-idea</code>, then regret it, you can always
789delete the branch with</p>
790</div>
791<div class="listingblock">
792<div class="content">
793<pre>$ git branch -D crazy-idea</pre>
794</div>
795</div>
796<div class="paragraph">
797<p>Branches are cheap and easy, so this is a good way to try something
798out.</p>
799</div>
800</div>
801</div>
802<div class="sect1">
803<h2 id="_using_git_for_collaboration">Using Git for collaboration</h2>
804<div class="sectionbody">
805<div class="paragraph">
806<p>Suppose that Alice has started a new project with a Git repository in
807<code>/home/alice/project</code>, and that Bob, who has a home directory on the
808same machine, wants to contribute.</p>
809</div>
810<div class="paragraph">
811<p>Bob begins with:</p>
812</div>
813<div class="listingblock">
814<div class="content">
815<pre>bob$ git clone /home/alice/project myrepo</pre>
816</div>
817</div>
818<div class="paragraph">
819<p>This creates a new directory <code>myrepo</code> containing a clone of Alice&#8217;s
820repository. The clone is on an equal footing with the original
821project, possessing its own copy of the original project&#8217;s history.</p>
822</div>
823<div class="paragraph">
824<p>Bob then makes some changes and commits them:</p>
825</div>
826<div class="listingblock">
827<div class="content">
828<pre>(edit files)
829bob$ git commit -a
830(repeat as necessary)</pre>
831</div>
832</div>
833<div class="paragraph">
834<p>When he&#8217;s ready, he tells Alice to pull changes from the repository
835at <code>/home/bob/myrepo</code>. She does this with:</p>
836</div>
837<div class="listingblock">
838<div class="content">
839<pre>alice$ cd /home/alice/project
840alice$ git pull /home/bob/myrepo master</pre>
841</div>
842</div>
843<div class="paragraph">
844<p>This merges the changes from Bob&#8217;s <code>master</code> branch into Alice&#8217;s
845current branch. If Alice has made her own changes in the meantime,
846then she may need to manually fix any conflicts.</p>
847</div>
848<div class="paragraph">
849<p>The <code>pull</code> command thus performs two operations: it fetches changes
850from a remote branch, then merges them into the current branch.</p>
851</div>
852<div class="paragraph">
853<p>Note that in general, Alice would want her local changes committed before
854initiating this <code>pull</code>. If Bob&#8217;s work conflicts with what Alice did since
855their histories forked, Alice will use her working tree and the index to
856resolve conflicts, and existing local changes will interfere with the
857conflict resolution process (Git will still perform the fetch but will
858refuse to merge&#8201;&#8212;&#8201;Alice will have to get rid of her local changes in
859some way and pull again when this happens).</p>
860</div>
861<div class="paragraph">
862<p>Alice can peek at what Bob did without merging first, using the <code>fetch</code>
863command; this allows Alice to inspect what Bob did, using a special
864symbol <code>FETCH_HEAD</code>, in order to determine if he has anything worth
865pulling, like this:</p>
866</div>
867<div class="listingblock">
868<div class="content">
869<pre>alice$ git fetch /home/bob/myrepo master
870alice$ git log -p HEAD..FETCH_HEAD</pre>
871</div>
872</div>
873<div class="paragraph">
874<p>This operation is safe even if Alice has uncommitted local changes.
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]875The range notation <code>HEAD</code><code>..</code><code>FETCH_HEAD</code> means "show everything that is reachable
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]876from the <code>FETCH_HEAD</code> but exclude anything that is reachable from <code>HEAD</code>".
877Alice already knows everything that leads to her current state (<code>HEAD</code>),
878and reviews what Bob has in his state (<code>FETCH_HEAD</code>) that she has not
879seen with this command.</p>
880</div>
881<div class="paragraph">
882<p>If Alice wants to visualize what Bob did since their histories forked
883she can issue the following command:</p>
884</div>
885<div class="listingblock">
886<div class="content">
887<pre>$ gitk HEAD..FETCH_HEAD</pre>
888</div>
889</div>
890<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]891<p>This uses the same two-dot range notation we saw earlier with <code>git</code> <code>log</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]892</div>
893<div class="paragraph">
894<p>Alice may want to view what both of them did since they forked.
895She can use three-dot form instead of the two-dot form:</p>
896</div>
897<div class="listingblock">
898<div class="content">
899<pre>$ gitk HEAD...FETCH_HEAD</pre>
900</div>
901</div>
902<div class="paragraph">
903<p>This means "show everything that is reachable from either one, but
904exclude anything that is reachable from both of them".</p>
905</div>
906<div class="paragraph">
Junio C Hamano902ce172024-08-21 21:02:37[diff] [blame]907<p>Please note that these range notations can be used with both <code>gitk</code>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]908and <code>git</code> <code>log</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]909</div>
910<div class="paragraph">
911<p>After inspecting what Bob did, if there is nothing urgent, Alice may
912decide to continue working without pulling from Bob. If Bob&#8217;s history
913does have something Alice would immediately need, Alice may choose to
914stash her work-in-progress first, do a <code>pull</code>, and then finally unstash
915her work-in-progress on top of the resulting history.</p>
916</div>
917<div class="paragraph">
918<p>When you are working in a small closely knit group, it is not
919unusual to interact with the same repository over and over
920again. By defining <em>remote</em> repository shorthand, you can make
921it easier:</p>
922</div>
923<div class="listingblock">
924<div class="content">
925<pre>alice$ git remote add bob /home/bob/myrepo</pre>
926</div>
927</div>
928<div class="paragraph">
929<p>With this, Alice can perform the first part of the <code>pull</code> operation
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]930alone using the <code>git</code> <code>fetch</code> command without merging them with her own
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]931branch, using:</p>
932</div>
933<div class="listingblock">
934<div class="content">
935<pre>alice$ git fetch bob</pre>
936</div>
937</div>
938<div class="paragraph">
939<p>Unlike the longhand form, when Alice fetches from Bob using a
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]940remote repository shorthand set up with <code>git</code> <code>remote</code>, what was
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]941fetched is stored in a remote-tracking branch, in this case
942<code>bob/master</code>. So after this:</p>
943</div>
944<div class="listingblock">
945<div class="content">
946<pre>alice$ git log -p master..bob/master</pre>
947</div>
948</div>
949<div class="paragraph">
950<p>shows a list of all the changes that Bob made since he branched from
951Alice&#8217;s <code>master</code> branch.</p>
952</div>
953<div class="paragraph">
954<p>After examining those changes, Alice
955could merge the changes into her <code>master</code> branch:</p>
956</div>
957<div class="listingblock">
958<div class="content">
959<pre>alice$ git merge bob/master</pre>
960</div>
961</div>
962<div class="paragraph">
963<p>This <code>merge</code> can also be done by <em>pulling from her own remote-tracking
964branch</em>, like this:</p>
965</div>
966<div class="listingblock">
967<div class="content">
968<pre>alice$ git pull . remotes/bob/master</pre>
969</div>
970</div>
971<div class="paragraph">
972<p>Note that git pull always merges into the current branch,
973regardless of what else is given on the command line.</p>
974</div>
975<div class="paragraph">
976<p>Later, Bob can update his repo with Alice&#8217;s latest changes using</p>
977</div>
978<div class="listingblock">
979<div class="content">
980<pre>bob$ git pull</pre>
981</div>
982</div>
983<div class="paragraph">
984<p>Note that he doesn&#8217;t need to give the path to Alice&#8217;s repository;
985when Bob cloned Alice&#8217;s repository, Git stored the location of her
986repository in the repository configuration, and that location is
987used for pulls:</p>
988</div>
989<div class="listingblock">
990<div class="content">
991<pre>bob$ git config --get remote.origin.url
992/home/alice/project</pre>
993</div>
994</div>
995<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]996<p>(The complete configuration created by <code>git</code> <code>clone</code> is visible using
997<code>git</code> <code>config</code> <code>-l</code>, and the <a href="git-config.html">git-config(1)</a> man page
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]998explains the meaning of each option.)</p>
999</div>
1000<div class="paragraph">
1001<p>Git also keeps a pristine copy of Alice&#8217;s <code>master</code> branch under the
1002name <code>origin/master</code>:</p>
1003</div>
1004<div class="listingblock">
1005<div class="content">
1006<pre>bob$ git branch -r
1007 origin/master</pre>
1008</div>
1009</div>
1010<div class="paragraph">
1011<p>If Bob later decides to work from a different host, he can still
1012perform clones and pulls using the ssh protocol:</p>
1013</div>
1014<div class="listingblock">
1015<div class="content">
1016<pre>bob$ git clone alice.org:/home/alice/project myrepo</pre>
1017</div>
1018</div>
1019<div class="paragraph">
1020<p>Alternatively, Git has a native protocol, or can use http;
1021see <a href="git-pull.html">git-pull(1)</a> for details.</p>
1022</div>
1023<div class="paragraph">
1024<p>Git can also be used in a CVS-like mode, with a central repository
1025that various users push changes to; see <a href="git-push.html">git-push(1)</a> and
1026<a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p>
1027</div>
1028</div>
1029</div>
1030<div class="sect1">
1031<h2 id="_exploring_history">Exploring history</h2>
1032<div class="sectionbody">
1033<div class="paragraph">
1034<p>Git history is represented as a series of interrelated commits. We
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1035have already seen that the <code>git</code> <code>log</code> command can list those commits.
1036Note that first line of each <code>git</code> <code>log</code> entry also gives a name for the
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1037commit:</p>
1038</div>
1039<div class="listingblock">
1040<div class="content">
1041<pre>$ git log
1042commit c82a22c39cbc32576f64f5c6b3f24b99ea8149c7
1043Author: Junio C Hamano &lt;junkio@cox.net&gt;
1044Date: Tue May 16 17:18:22 2006 -0700
1045
1046 merge-base: Clarify the comments on post processing.</pre>
1047</div>
1048</div>
1049<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1050<p>We can give this name to <code>git</code> <code>show</code> to see the details about this
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1051commit.</p>
1052</div>
1053<div class="listingblock">
1054<div class="content">
1055<pre>$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7</pre>
1056</div>
1057</div>
1058<div class="paragraph">
1059<p>But there are other ways to refer to commits. You can use any initial
1060part of the name that is long enough to uniquely identify the commit:</p>
1061</div>
1062<div class="listingblock">
1063<div class="content">
1064<pre>$ git show c82a22c39c # the first few characters of the name are
1065 # usually enough
1066$ git show HEAD # the tip of the current branch
1067$ git show experimental # the tip of the "experimental" branch</pre>
1068</div>
1069</div>
1070<div class="paragraph">
1071<p>Every commit usually has one "parent" commit
1072which points to the previous state of the project:</p>
1073</div>
1074<div class="listingblock">
1075<div class="content">
1076<pre>$ git show HEAD^ # to see the parent of HEAD
1077$ git show HEAD^^ # to see the grandparent of HEAD
1078$ git show HEAD~4 # to see the great-great grandparent of HEAD</pre>
1079</div>
1080</div>
1081<div class="paragraph">
1082<p>Note that merge commits may have more than one parent:</p>
1083</div>
1084<div class="listingblock">
1085<div class="content">
1086<pre>$ git show HEAD^1 # show the first parent of HEAD (same as HEAD^)
1087$ git show HEAD^2 # show the second parent of HEAD</pre>
1088</div>
1089</div>
1090<div class="paragraph">
1091<p>You can also give commits names of your own; after running</p>
1092</div>
1093<div class="listingblock">
1094<div class="content">
1095<pre>$ git tag v2.5 1b2e1d63ff</pre>
1096</div>
1097</div>
1098<div class="paragraph">
1099<p>you can refer to <code>1b2e1d63ff</code> by the name <code>v2.5</code>. If you intend to
1100share this name with other people (for example, to identify a release
1101version), you should create a "tag" object, and perhaps sign it; see
1102<a href="git-tag.html">git-tag(1)</a> for details.</p>
1103</div>
1104<div class="paragraph">
1105<p>Any Git command that needs to know a commit can take any of these
1106names. For example:</p>
1107</div>
1108<div class="listingblock">
1109<div class="content">
1110<pre>$ git diff v2.5 HEAD # compare the current HEAD to v2.5
1111$ git branch stable v2.5 # start a new branch named "stable" based
1112 # at v2.5
1113$ git reset --hard HEAD^ # reset your current branch and working
1114 # directory to its state at HEAD^</pre>
1115</div>
1116</div>
1117<div class="paragraph">
1118<p>Be careful with that last command: in addition to losing any changes
1119in the working directory, it will also remove all later commits from
1120this branch. If this branch is the only branch containing those
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1121commits, they will be lost. Also, don&#8217;t use <code>git</code> <code>reset</code> on a
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1122publicly-visible branch that other developers pull from, as it will
1123force needless merges on other developers to clean up the history.
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1124If you need to undo changes that you have pushed, use <code>git</code> <code>revert</code>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1125instead.</p>
1126</div>
1127<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1128<p>The <code>git</code> <code>grep</code> command can search for strings in any version of your
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1129project, so</p>
1130</div>
1131<div class="listingblock">
1132<div class="content">
1133<pre>$ git grep "hello" v2.5</pre>
1134</div>
1135</div>
1136<div class="paragraph">
1137<p>searches for all occurrences of "hello" in <code>v2.5</code>.</p>
1138</div>
1139<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1140<p>If you leave out the commit name, <code>git</code> <code>grep</code> will search any of the
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1141files it manages in your current directory. So</p>
1142</div>
1143<div class="listingblock">
1144<div class="content">
1145<pre>$ git grep "hello"</pre>
1146</div>
1147</div>
1148<div class="paragraph">
1149<p>is a quick way to search just the files that are tracked by Git.</p>
1150</div>
1151<div class="paragraph">
1152<p>Many Git commands also take sets of commits, which can be specified
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1153in a number of ways. Here are some examples with <code>git</code> <code>log</code>:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1154</div>
1155<div class="listingblock">
1156<div class="content">
1157<pre>$ git log v2.5..v2.6 # commits between v2.5 and v2.6
1158$ git log v2.5.. # commits since v2.5
1159$ git log --since="2 weeks ago" # commits from the last 2 weeks
1160$ git log v2.5.. Makefile # commits since v2.5 which modify
1161 # Makefile</pre>
1162</div>
1163</div>
1164<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1165<p>You can also give <code>git</code> <code>log</code> a "range" of commits where the first is not
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1166necessarily an ancestor of the second; for example, if the tips of
1167the branches <code>stable</code> and <code>master</code> diverged from a common
1168commit some time ago, then</p>
1169</div>
1170<div class="listingblock">
1171<div class="content">
1172<pre>$ git log stable..master</pre>
1173</div>
1174</div>
1175<div class="paragraph">
1176<p>will list commits made in the <code>master</code> branch but not in the
1177stable branch, while</p>
1178</div>
1179<div class="listingblock">
1180<div class="content">
1181<pre>$ git log master..stable</pre>
1182</div>
1183</div>
1184<div class="paragraph">
1185<p>will show the list of commits made on the stable branch but not
1186the <code>master</code> branch.</p>
1187</div>
1188<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1189<p>The <code>git</code> <code>log</code> command has a weakness: it must present commits in a
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1190list. When the history has lines of development that diverged and
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1191then merged back together, the order in which <code>git</code> <code>log</code> presents
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1192those commits is meaningless.</p>
1193</div>
1194<div class="paragraph">
1195<p>Most projects with multiple contributors (such as the Linux kernel,
1196or Git itself) have frequent merges, and <code>gitk</code> does a better job of
1197visualizing their history. For example,</p>
1198</div>
1199<div class="listingblock">
1200<div class="content">
1201<pre>$ gitk --since="2 weeks ago" drivers/</pre>
1202</div>
1203</div>
1204<div class="paragraph">
1205<p>allows you to browse any commits from the last 2 weeks of commits
1206that modified files under the <code>drivers</code> directory. (Note: you can
1207adjust gitk&#8217;s fonts by holding down the control key while pressing
1208"-" or "+".)</p>
1209</div>
1210<div class="paragraph">
1211<p>Finally, most commands that take filenames will optionally allow you
1212to precede any filename by a commit, to specify a particular version
1213of the file:</p>
1214</div>
1215<div class="listingblock">
1216<div class="content">
1217<pre>$ git diff v2.5:Makefile HEAD:Makefile.in</pre>
1218</div>
1219</div>
1220<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1221<p>You can also use <code>git</code> <code>show</code> to see any such file:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1222</div>
1223<div class="listingblock">
1224<div class="content">
1225<pre>$ git show v2.5:Makefile</pre>
1226</div>
1227</div>
1228</div>
1229</div>
1230<div class="sect1">
1231<h2 id="_next_steps">Next Steps</h2>
1232<div class="sectionbody">
1233<div class="paragraph">
1234<p>This tutorial should be enough to perform basic distributed revision
1235control for your projects. However, to fully understand the depth
1236and power of Git you need to understand two simple ideas on which it
1237is based:</p>
1238</div>
1239<div class="ulist">
1240<ul>
1241<li>
1242<p>The object database is the rather elegant system used to
1243store the history of your project&#8212;&#8203;files, directories, and
1244commits.</p>
1245</li>
1246<li>
1247<p>The index file is a cache of the state of a directory tree,
1248used to create commits, check out working directories, and
1249hold the various trees involved in a merge.</p>
1250</li>
1251</ul>
1252</div>
1253<div class="paragraph">
1254<p>Part two of this tutorial explains the object
1255database, the index file, and a few other odds and ends that you&#8217;ll
1256need to make the most of Git. You can find it at <a href="gittutorial-2.html">gittutorial-2(7)</a>.</p>
1257</div>
1258<div class="paragraph">
1259<p>If you don&#8217;t want to continue with that right away, a few other
1260digressions that may be interesting at this point are:</p>
1261</div>
1262<div class="ulist">
1263<ul>
1264<li>
1265<p><a href="git-format-patch.html">git-format-patch(1)</a>, <a href="git-am.html">git-am(1)</a>: These convert
1266series of git commits into emailed patches, and vice versa,
1267useful for projects such as the Linux kernel which rely heavily
1268on emailed patches.</p>
1269</li>
1270<li>
1271<p><a href="git-bisect.html">git-bisect(1)</a>: When there is a regression in your
1272project, one way to track down the bug is by searching through
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]1273the history to find the exact commit that&#8217;s to blame. <code>git</code> <code>bisect</code>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1274can help you perform a binary search for that commit. It is
1275smart enough to perform a close-to-optimal search even in the
1276case of complex non-linear history with lots of merged branches.</p>
1277</li>
1278<li>
1279<p><a href="gitworkflows.html">gitworkflows(7)</a>: Gives an overview of recommended
1280workflows.</p>
1281</li>
1282<li>
1283<p><a href="giteveryday.html">giteveryday(7)</a>: Everyday Git with 20 Commands Or So.</p>
1284</li>
1285<li>
1286<p><a href="gitcvs-migration.html">gitcvs-migration(7)</a>: Git for CVS users.</p>
1287</li>
1288</ul>
1289</div>
1290</div>
1291</div>
1292<div class="sect1">
1293<h2 id="_see_also">SEE ALSO</h2>
1294<div class="sectionbody">
1295<div class="paragraph">
1296<p><a href="gittutorial-2.html">gittutorial-2(7)</a>,
1297<a href="gitcvs-migration.html">gitcvs-migration(7)</a>,
1298<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,
1299<a href="gitglossary.html">gitglossary(7)</a>,
1300<a href="git-help.html">git-help(1)</a>,
1301<a href="gitworkflows.html">gitworkflows(7)</a>,
1302<a href="giteveryday.html">giteveryday(7)</a>,
1303<a href="user-manual.html">The Git User&#8217;s Manual</a></p>
1304</div>
1305</div>
1306</div>
1307<div class="sect1">
1308<h2 id="_git">GIT</h2>
1309<div class="sectionbody">
1310<div class="paragraph">
1311<p>Part of the <a href="git.html">git(1)</a> suite</p>
1312</div>
1313</div>
1314</div>
1315</div>
1316<div id="footer">
1317<div id="footer-text">
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame^]1318Last updated 2025-02-14 21:38:14 -0800
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1319</div>
1320</div>
1321</body>
1322</html>