git-checkout.html

   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>git-checkout(1)</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;
 438 }
 439 </style>
 440 </head>
 441 <body class="manpage">
 442 <div id="header">
 443 <h1>git-checkout(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-checkout - Switch branches or restore working tree files</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"><em>git checkout</em> [-q] [-f] [-m] [&lt;branch&gt;]
 455 <em>git checkout</em> [-q] [-f] [-m] --detach [&lt;branch&gt;]
 456 <em>git checkout</em> [-q] [-f] [-m] [--detach] &lt;commit&gt;
 457 <em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] &lt;new-branch&gt;] [&lt;start-point&gt;]
 458 <em>git checkout</em> [-f] &lt;tree-ish&gt; [--] &lt;pathspec&gt;&#8230;&#8203;
 459 <em>git checkout</em> [-f] &lt;tree-ish&gt; --pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]
 460 <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [--] &lt;pathspec&gt;&#8230;&#8203;
 461 <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] --pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]
 462 <em>git checkout</em> (-p|--patch) [&lt;tree-ish&gt;] [--] [&lt;pathspec&gt;&#8230;&#8203;]</pre>
 463 </div>
 464 </div>
 465 </div>
 466 <div class="sect1">
 467 <h2 id="_description">DESCRIPTION</h2>
 468 <div class="sectionbody">
 469 <div class="paragraph">
 470 <p>Updates files in the working tree to match the version in the index
 471 or the specified tree.  If no pathspec was given, <em>git checkout</em> will
 472 also update <code>HEAD</code> to set the specified branch as the current
 473 branch.</p>
 474 </div>
 475 <div class="dlist">
 476 <dl>
 477 <dt class="hdlist1"><em>git checkout</em> [&lt;branch&gt;]</dt>
 478 <dd>
 479 <p>To prepare for working on <em>&lt;branch&gt;</em>, switch to it by updating
 480 the index and the files in the working tree, and by pointing
 481 <code>HEAD</code> at the branch. Local modifications to the files in the
 482 working tree are kept, so that they can be committed to the
 483 <em>&lt;branch&gt;</em>.</p>
 484 <div class="paragraph">
 485 <p>If <em>&lt;branch&gt;</em> is not found but there does exist a tracking branch in
 486 exactly one remote (call it <em>&lt;remote&gt;</em>) with a matching name and
 487 <code>--no-guess</code> is not specified, treat as equivalent to</p>
 488 </div>
 489 <div class="listingblock">
 490 <div class="content">
 491 <pre>$ git checkout -b &lt;branch&gt; --track &lt;remote&gt;/&lt;branch&gt;</pre>
 492 </div>
 493 </div>
 494 <div class="paragraph">
 495 <p>You could omit <em>&lt;branch&gt;</em>, in which case the command degenerates to
 496 "check out the current branch", which is a glorified no-op with
 497 rather expensive side-effects to show only the tracking information,
 498 if it exists, for the current branch.</p>
 499 </div>
 500 </dd>
 501 <dt class="hdlist1"><em>git checkout</em> -b|-B &lt;new-branch&gt; [&lt;start-point&gt;]</dt>
 502 <dd>
 503 <p>Specifying <code>-b</code> causes a new branch to be created as if
 504 <a href="git-branch.html">git-branch(1)</a> were called and then checked out.  In
 505 this case you can use the <code>--track</code> or <code>--no-track</code> options,
 506 which will be passed to <em>git branch</em>.  As a convenience,
 507 <code>--track</code> without <code>-b</code> implies branch creation; see the
 508 description of <code>--track</code> below.</p>
 509 <div class="paragraph">
 510 <p>If <code>-B</code> is given, <em>&lt;new-branch&gt;</em> is created if it doesn&#8217;t exist; otherwise, it
 511 is reset. This is the transactional equivalent of</p>
 512 </div>
 513 <div class="listingblock">
 514 <div class="content">
 515 <pre>$ git branch -f &lt;branch&gt; [&lt;start-point&gt;]
 516 $ git checkout &lt;branch&gt;</pre>
 517 </div>
 518 </div>
 519 <div class="paragraph">
 520 <p>that is to say, the branch is not reset/created unless "git checkout" is
 521 successful (e.g., when the branch is in use in another worktree, not
 522 just the current branch stays the same, but the branch is not reset to
 523 the start-point, either).</p>
 524 </div>
 525 </dd>
 526 <dt class="hdlist1"><em>git checkout</em> --detach [&lt;branch&gt;]</dt>
 527 <dt class="hdlist1"><em>git checkout</em> [--detach] &lt;commit&gt;</dt>
 528 <dd>
 529 <p>Prepare to work on top of <em>&lt;commit&gt;</em>, by detaching <code>HEAD</code> at it
 530 (see "DETACHED HEAD" section), and updating the index and the
 531 files in the working tree.  Local modifications to the files
 532 in the working tree are kept, so that the resulting working
 533 tree will be the state recorded in the commit plus the local
 534 modifications.</p>
 535 <div class="paragraph">
 536 <p>When the <em>&lt;commit&gt;</em> argument is a branch name, the <code>--detach</code> option can
 537 be used to detach <code>HEAD</code> at the tip of the branch (<code>git</code> <code>checkout</code>
 538 <em>&lt;branch&gt;</em> would check out that branch without detaching <code>HEAD</code>).</p>
 539 </div>
 540 <div class="paragraph">
 541 <p>Omitting <em>&lt;branch&gt;</em> detaches <code>HEAD</code> at the tip of the current branch.</p>
 542 </div>
 543 </dd>
 544 <dt class="hdlist1"><em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;&#8203;</dt>
 545 <dt class="hdlist1"><em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] --pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]</dt>
 546 <dd>
 547 <p>Overwrite the contents of the files that match the pathspec.
 548 When the <em>&lt;tree-ish&gt;</em> (most often a commit) is not given,
 549 overwrite working tree with the contents in the index.
 550 When the <em>&lt;tree-ish&gt;</em> is given, overwrite both the index and
 551 the working tree with the contents at the <em>&lt;tree-ish&gt;</em>.</p>
 552 <div class="paragraph">
 553 <p>The index may contain unmerged entries because of a previous failed merge.
 554 By default, if you try to check out such an entry from the index, the
 555 checkout operation will fail and nothing will be checked out.
 556 Using <code>-f</code> will ignore these unmerged entries.  The contents from a
 557 specific side of the merge can be checked out of the index by
 558 using <code>--ours</code> or <code>--theirs</code>.  With <code>-m</code>, changes made to the working tree
 559 file can be discarded to re-create the original conflicted merge result.</p>
 560 </div>
 561 </dd>
 562 <dt class="hdlist1"><em>git checkout</em> (-p|--patch) [&lt;tree-ish&gt;] [--] [&lt;pathspec&gt;&#8230;&#8203;]</dt>
 563 <dd>
 564 <p>This is similar to the previous mode, but lets you use the
 565 interactive interface to show the "diff" output and choose which
 566 hunks to use in the result.  See below for the description of
 567 <code>--patch</code> option.</p>
 568 </dd>
 569 </dl>
 570 </div>
 571 </div>
 572 </div>
 573 <div class="sect1">
 574 <h2 id="_options">OPTIONS</h2>
 575 <div class="sectionbody">
 576 <div class="dlist">
 577 <dl>
 578 <dt class="hdlist1">-q</dt>
 579 <dt class="hdlist1">--quiet</dt>
 580 <dd>
 581 <p>Quiet, suppress feedback messages.</p>
 582 </dd>
 583 <dt class="hdlist1">--progress</dt>
 584 <dt class="hdlist1">--no-progress</dt>
 585 <dd>
 586 <p>Progress status is reported on the standard error stream
 587 by default when it is attached to a terminal, unless <code>--quiet</code>
 588 is specified. This flag enables progress reporting even if not
 589 attached to a terminal, regardless of <code>--quiet</code>.</p>
 590 </dd>
 591 <dt class="hdlist1">-f</dt>
 592 <dt class="hdlist1">--force</dt>
 593 <dd>
 594 <p>When switching branches, proceed even if the index or the
 595 working tree differs from <code>HEAD</code>, and even if there are untracked
 596 files in the way.  This is used to throw away local changes and
 597 any untracked files or directories that are in the way.</p>
 598 <div class="paragraph">
 599 <p>When checking out paths from the index, do not fail upon unmerged
 600 entries; instead, unmerged entries are ignored.</p>
 601 </div>
 602 </dd>
 603 <dt class="hdlist1">--ours</dt>
 604 <dt class="hdlist1">--theirs</dt>
 605 <dd>
 606 <p>When checking out paths from the index, check out stage #2
 607 (<em>ours</em>) or #3 (<em>theirs</em>) for unmerged paths.</p>
 608 <div class="paragraph">
 609 <p>Note that during <code>git</code> <code>rebase</code> and <code>git</code> <code>pull</code> <code>--rebase</code>, <em>ours</em> and
 610 <em>theirs</em> may appear swapped; <code>--ours</code> gives the version from the
 611 branch the changes are rebased onto, while <code>--theirs</code> gives the
 612 version from the branch that holds your work that is being rebased.</p>
 613 </div>
 614 <div class="paragraph">
 615 <p>This is because <code>rebase</code> is used in a workflow that treats the
 616 history at the remote as the shared canonical one, and treats the
 617 work done on the branch you are rebasing as the third-party work to
 618 be integrated, and you are temporarily assuming the role of the
 619 keeper of the canonical history during the rebase.  As the keeper of
 620 the canonical history, you need to view the history from the remote
 621 as <code>ours</code> (i.e. "our shared canonical history"), while what you did
 622 on your side branch as <code>theirs</code> (i.e. "one contributor&#8217;s work on top
 623 of it").</p>
 624 </div>
 625 </dd>
 626 <dt class="hdlist1">-b &lt;new-branch&gt;</dt>
 627 <dd>
 628 <p>Create a new branch named <em>&lt;new-branch&gt;</em>, start it at
 629 <em>&lt;start-point&gt;</em>, and check the resulting branch out;
 630 see <a href="git-branch.html">git-branch(1)</a> for details.</p>
 631 </dd>
 632 <dt class="hdlist1">-B &lt;new-branch&gt;</dt>
 633 <dd>
 634 <p>Creates the branch <em>&lt;new-branch&gt;</em>, start it at <em>&lt;start-point&gt;</em>;
 635 if it already exists, then reset it to <em>&lt;start-point&gt;</em>. And then
 636 check the resulting branch out.  This is equivalent to running
 637 "git branch" with "-f" followed by "git checkout" of that branch;
 638 see <a href="git-branch.html">git-branch(1)</a> for details.</p>
 639 </dd>
 640 <dt class="hdlist1">-t</dt>
 641 <dt class="hdlist1">--track[=(direct|inherit)]</dt>
 642 <dd>
 643 <p>When creating a new branch, set up "upstream" configuration. See
 644 "--track" in <a href="git-branch.html">git-branch(1)</a> for details.</p>
 645 <div class="paragraph">
 646 <p>If no <code>-b</code> option is given, the name of the new branch will be
 647 derived from the remote-tracking branch, by looking at the local part of
 648 the refspec configured for the corresponding remote, and then stripping
 649 the initial part up to the "*".
 650 This would tell us to use <code>hack</code> as the local branch when branching
 651 off of <code>origin/hack</code> (or <code>remotes/origin/hack</code>, or even
 652 <code>refs/remotes/origin/hack</code>).  If the given name has no slash, or the above
 653 guessing results in an empty name, the guessing is aborted.  You can
 654 explicitly give a name with <code>-b</code> in such a case.</p>
 655 </div>
 656 </dd>
 657 <dt class="hdlist1">--no-track</dt>
 658 <dd>
 659 <p>Do not set up "upstream" configuration, even if the
 660 <code>branch.autoSetupMerge</code> configuration variable is true.</p>
 661 </dd>
 662 <dt class="hdlist1">--guess</dt>
 663 <dt class="hdlist1">--no-guess</dt>
 664 <dd>
 665 <p>If <em>&lt;branch&gt;</em> is not found but there does exist a tracking
 666 branch in exactly one remote (call it <em>&lt;remote&gt;</em>) with a
 667 matching name, treat as equivalent to</p>
 668 <div class="listingblock">
 669 <div class="content">
 670 <pre>$ git checkout -b &lt;branch&gt; --track &lt;remote&gt;/&lt;branch&gt;</pre>
 671 </div>
 672 </div>
 673 <div class="paragraph">
 674 <p>If the branch exists in multiple remotes and one of them is named by
 675 the <code>checkout.defaultRemote</code> configuration variable, we&#8217;ll use that
 676 one for the purposes of disambiguation, even if the <em>&lt;branch&gt;</em> isn&#8217;t
 677 unique across all remotes. Set it to
 678 e.g. <code>checkout.defaultRemote=origin</code> to always checkout remote
 679 branches from there if <em>&lt;branch&gt;</em> is ambiguous but exists on the
 680 <em>origin</em> remote. See also <code>checkout.defaultRemote</code> in
 681 <a href="git-config.html">git-config(1)</a>.</p>
 682 </div>
 683 <div class="paragraph">
 684 <p><code>--guess</code> is the default behavior. Use <code>--no-guess</code> to disable it.</p>
 685 </div>
 686 <div class="paragraph">
 687 <p>The default behavior can be set via the <code>checkout.guess</code> configuration
 688 variable.</p>
 689 </div>
 690 </dd>
 691 <dt class="hdlist1">-l</dt>
 692 <dd>
 693 <p>Create the new branch&#8217;s reflog; see <a href="git-branch.html">git-branch(1)</a> for
 694 details.</p>
 695 </dd>
 696 <dt class="hdlist1">-d</dt>
 697 <dt class="hdlist1">--detach</dt>
 698 <dd>
 699 <p>Rather than checking out a branch to work on it, check out a
 700 commit for inspection and discardable experiments.
 701 This is the default behavior of <code>git</code> <code>checkout</code> <em>&lt;commit&gt;</em> when
 702 <em>&lt;commit&gt;</em> is not a branch name.  See the "DETACHED HEAD" section
 703 below for details.</p>
 704 </dd>
 705 <dt class="hdlist1">--orphan &lt;new-branch&gt;</dt>
 706 <dd>
 707 <p>Create a new unborn branch, named <em>&lt;new-branch&gt;</em>, started from
 708 <em>&lt;start-point&gt;</em> and switch to it.  The first commit made on this
 709 new branch will have no parents and it will be the root of a new
 710 history totally disconnected from all the other branches and
 711 commits.</p>
 712 <div class="paragraph">
 713 <p>The index and the working tree are adjusted as if you had previously run
 714 <code>git</code> <code>checkout</code> <em>&lt;start-point&gt;</em>.  This allows you to start a new history
 715 that records a set of paths similar to <em>&lt;start-point&gt;</em> by easily running
 716 <code>git</code> <code>commit</code> <code>-a</code> to make the root commit.</p>
 717 </div>
 718 <div class="paragraph">
 719 <p>This can be useful when you want to publish the tree from a commit
 720 without exposing its full history. You might want to do this to publish
 721 an open source branch of a project whose current tree is "clean", but
 722 whose full history contains proprietary or otherwise encumbered bits of
 723 code.</p>
 724 </div>
 725 <div class="paragraph">
 726 <p>If you want to start a disconnected history that records a set of paths
 727 that is totally different from the one of <em>&lt;start-point&gt;</em>, then you should
 728 clear the index and the working tree right after creating the orphan
 729 branch by running <code>git</code> <code>rm</code> <code>-rf</code> . from the top level of the working tree.
 730 Afterwards you will be ready to prepare your new files, repopulating the
 731 working tree, by copying them from elsewhere, extracting a tarball, etc.</p>
 732 </div>
 733 </dd>
 734 <dt class="hdlist1">--ignore-skip-worktree-bits</dt>
 735 <dd>
 736 <p>In sparse checkout mode, <code>git</code> <code>checkout</code> <code>--</code> <em>&lt;paths&gt;</em> would
 737 update only entries matched by <em>&lt;paths&gt;</em> and sparse patterns
 738 in <code>$GIT_DIR/info/sparse-checkout</code>. This option ignores
 739 the sparse patterns and adds back any files in <em>&lt;paths&gt;</em>.</p>
 740 </dd>
 741 <dt class="hdlist1">-m</dt>
 742 <dt class="hdlist1">--merge</dt>
 743 <dd>
 744 <p>When switching branches,
 745 if you have local modifications to one or more files that
 746 are different between the current branch and the branch to
 747 which you are switching, the command refuses to switch
 748 branches in order to preserve your modifications in context.
 749 However, with this option, a three-way merge between the current
 750 branch, your working tree contents, and the new branch
 751 is done, and you will be on the new branch.</p>
 752 <div class="paragraph">
 753 <p>When a merge conflict happens, the index entries for conflicting
 754 paths are left unmerged, and you need to resolve the conflicts
 755 and mark the resolved paths with <code>git</code> <code>add</code> (or <code>git</code> <code>rm</code> if the merge
 756 should result in deletion of the path).</p>
 757 </div>
 758 <div class="paragraph">
 759 <p>When checking out paths from the index, this option lets you recreate
 760 the conflicted merge in the specified paths.  This option cannot be
 761 used when checking out paths from a tree-ish.</p>
 762 </div>
 763 <div class="paragraph">
 764 <p>When switching branches with <code>--merge</code>, staged changes may be lost.</p>
 765 </div>
 766 </dd>
 767 <dt class="hdlist1">--conflict=&lt;style&gt;</dt>
 768 <dd>
 769 <p>The same as <code>--merge</code> option above, but changes the way the
 770 conflicting hunks are presented, overriding the
 771 <code>merge.conflictStyle</code> configuration variable.  Possible values are
 772 "merge" (default), "diff3", and "zdiff3".</p>
 773 </dd>
 774 <dt class="hdlist1">-p</dt>
 775 <dt class="hdlist1">--patch</dt>
 776 <dd>
 777 <p>Interactively select hunks in the difference between the
 778 <em>&lt;tree-ish&gt;</em> (or the index, if unspecified) and the working
 779 tree.  The chosen hunks are then applied in reverse to the
 780 working tree (and if a <em>&lt;tree-ish&gt;</em> was specified, the index).</p>
 781 <div class="paragraph">
 782 <p>This means that you can use <code>git</code> <code>checkout</code> <code>-p</code> to selectively discard
 783 edits from your current working tree. See the &#8220;Interactive Mode&#8221;
 784 section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p>
 785 </div>
 786 <div class="paragraph">
 787 <p>Note that this option uses the no overlay mode by default (see also
 788 <code>--overlay</code>), and currently doesn&#8217;t support overlay mode.</p>
 789 </div>
 790 </dd>
 791 <dt class="hdlist1">--ignore-other-worktrees</dt>
 792 <dd>
 793 <p><code>git</code> <code>checkout</code> refuses when the wanted branch is already checked
 794 out or otherwise in use by another worktree. This option makes
 795 it check the branch out anyway. In other words, the branch can
 796 be in use by more than one worktree.</p>
 797 </dd>
 798 <dt class="hdlist1">--overwrite-ignore</dt>
 799 <dt class="hdlist1">--no-overwrite-ignore</dt>
 800 <dd>
 801 <p>Silently overwrite ignored files when switching branches. This
 802 is the default behavior. Use <code>--no-overwrite-ignore</code> to abort
 803 the operation when the new branch contains ignored files.</p>
 804 </dd>
 805 <dt class="hdlist1">--recurse-submodules</dt>
 806 <dt class="hdlist1">--no-recurse-submodules</dt>
 807 <dd>
 808 <p>Using <code>--recurse-submodules</code> will update the content of all active
 809 submodules according to the commit recorded in the superproject. If
 810 local modifications in a submodule would be overwritten the checkout
 811 will fail unless <code>-f</code> is used. If nothing (or <code>--no-recurse-submodules</code>)
 812 is used, submodules working trees will not be updated.
 813 Just like <a href="git-submodule.html">git-submodule(1)</a>, this will detach <code>HEAD</code> of the
 814 submodule.</p>
 815 </dd>
 816 <dt class="hdlist1">--overlay</dt>
 817 <dt class="hdlist1">--no-overlay</dt>
 818 <dd>
 819 <p>In the default overlay mode, <code>git</code> <code>checkout</code> never
 820 removes files from the index or the working tree.  When
 821 specifying <code>--no-overlay</code>, files that appear in the index and
 822 working tree, but not in <em>&lt;tree-ish&gt;</em> are removed, to make them
 823 match <em>&lt;tree-ish&gt;</em> exactly.</p>
 824 </dd>
 825 <dt class="hdlist1">--pathspec-from-file=&lt;file&gt;</dt>
 826 <dd>
 827 <p>Pathspec is passed in <em>&lt;file&gt;</em> instead of commandline args. If
 828 <em>&lt;file&gt;</em> is exactly <code>-</code> then standard input is used. Pathspec
 829 elements are separated by LF or CR/LF. Pathspec elements can be
 830 quoted as explained for the configuration variable <code>core.quotePath</code>
 831 (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and
 832 global <code>--literal-pathspecs</code>.</p>
 833 </dd>
 834 <dt class="hdlist1">--pathspec-file-nul</dt>
 835 <dd>
 836 <p>Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are
 837 separated with NUL character and all other characters are taken
 838 literally (including newlines and quotes).</p>
 839 </dd>
 840 <dt class="hdlist1">&lt;branch&gt;</dt>
 841 <dd>
 842 <p>Branch to checkout; if it refers to a branch (i.e., a name that,
 843 when prepended with "refs/heads/", is a valid ref), then that
 844 branch is checked out. Otherwise, if it refers to a valid
 845 commit, your <code>HEAD</code> becomes "detached" and you are no longer on
 846 any branch (see below for details).</p>
 847 <div class="paragraph">
 848 <p>You can use the <code>@</code>{-N} syntax to refer to the N-th last
 849 branch/commit checked out using "git checkout" operation. You may
 850 also specify <code>-</code> which is synonymous to <code>@</code>{-1}.</p>
 851 </div>
 852 <div class="paragraph">
 853 <p>As a special case, you may use <code>A</code><code>...</code><code>B</code> as a shortcut for the
 854 merge base of <code>A</code> and <code>B</code> if there is exactly one merge base. You can
 855 leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p>
 856 </div>
 857 </dd>
 858 <dt class="hdlist1">&lt;new-branch&gt;</dt>
 859 <dd>
 860 <p>Name for the new branch.</p>
 861 </dd>
 862 <dt class="hdlist1">&lt;start-point&gt;</dt>
 863 <dd>
 864 <p>The name of a commit at which to start the new branch; see
 865 <a href="git-branch.html">git-branch(1)</a> for details. Defaults to <code>HEAD</code>.</p>
 866 <div class="paragraph">
 867 <p>As a special case, you may use "A<code>...</code><code>B</code>" as a shortcut for the
 868 merge base of <code>A</code> and <code>B</code> if there is exactly one merge base. You can
 869 leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p>
 870 </div>
 871 </dd>
 872 <dt class="hdlist1">&lt;tree-ish&gt;</dt>
 873 <dd>
 874 <p>Tree to checkout from (when paths are given). If not specified,
 875 the index will be used.</p>
 876 <div class="paragraph">
 877 <p>As a special case, you may use "A<code>...</code><code>B</code>" as a shortcut for the
 878 merge base of <code>A</code> and <code>B</code> if there is exactly one merge base. You can
 879 leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p>
 880 </div>
 881 </dd>
 882 <dt class="hdlist1">--</dt>
 883 <dd>
 884 <p>Do not interpret any more arguments as options.</p>
 885 </dd>
 886 <dt class="hdlist1">&lt;pathspec&gt;&#8230;&#8203;</dt>
 887 <dd>
 888 <p>Limits the paths affected by the operation.</p>
 889 <div class="paragraph">
 890 <p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p>
 891 </div>
 892 </dd>
 893 </dl>
 894 </div>
 895 </div>
 896 </div>
 897 <div class="sect1">
 898 <h2 id="_detached_head">DETACHED HEAD</h2>
 899 <div class="sectionbody">
 900 <div class="paragraph">
 901 <p><code>HEAD</code> normally refers to a named branch (e.g. <code>master</code>). Meanwhile, each
 902 branch refers to a specific commit. Let&#8217;s look at a repo with three
 903 commits, one of them tagged, and with branch <code>master</code> checked out:</p>
 904 </div>
 905 <div class="listingblock">
 906 <div class="content">
 907 <pre>           HEAD (refers to branch 'master')
 908             |
 909             v
 910 a---b---c  branch 'master' (refers to commit 'c')
 911     ^
 912     |
 913   tag 'v2.0' (refers to commit 'b')</pre>
 914 </div>
 915 </div>
 916 <div class="paragraph">
 917 <p>When a commit is created in this state, the branch is updated to refer to
 918 the new commit. Specifically, <em>git commit</em> creates a new commit <code>d</code>, whose
 919 parent is commit <code>c</code>, and then updates branch <code>master</code> to refer to new
 920 commit <code>d</code>. <code>HEAD</code> still refers to branch <code>master</code> and so indirectly now refers
 921 to commit <code>d</code>:</p>
 922 </div>
 923 <div class="listingblock">
 924 <div class="content">
 925 <pre>$ edit; git add; git commit
 926
 927                HEAD (refers to branch 'master')
 928                 |
 929                 v
 930 a---b---c---d  branch 'master' (refers to commit 'd')
 931     ^
 932     |
 933   tag 'v2.0' (refers to commit 'b')</pre>
 934 </div>
 935 </div>
 936 <div class="paragraph">
 937 <p>It is sometimes useful to be able to checkout a commit that is not at
 938 the tip of any named branch, or even to create a new commit that is not
 939 referenced by a named branch. Let&#8217;s look at what happens when we
 940 checkout commit <code>b</code> (here we show two ways this may be done):</p>
 941 </div>
 942 <div class="listingblock">
 943 <div class="content">
 944 <pre>$ git checkout v2.0  # or
 945 $ git checkout master^^
 946
 947    HEAD (refers to commit 'b')
 948     |
 949     v
 950 a---b---c---d  branch 'master' (refers to commit 'd')
 951     ^
 952     |
 953   tag 'v2.0' (refers to commit 'b')</pre>
 954 </div>
 955 </div>
 956 <div class="paragraph">
 957 <p>Notice that regardless of which checkout command we use, <code>HEAD</code> now refers
 958 directly to commit <code>b</code>. This is known as being in detached <code>HEAD</code> state.
 959 It means simply that <code>HEAD</code> refers to a specific commit, as opposed to
 960 referring to a named branch. Let&#8217;s see what happens when we create a commit:</p>
 961 </div>
 962 <div class="listingblock">
 963 <div class="content">
 964 <pre>$ edit; git add; git commit
 965
 966      HEAD (refers to commit 'e')
 967       |
 968       v
 969       e
 970      /
 971 a---b---c---d  branch 'master' (refers to commit 'd')
 972     ^
 973     |
 974   tag 'v2.0' (refers to commit 'b')</pre>
 975 </div>
 976 </div>
 977 <div class="paragraph">
 978 <p>There is now a new commit <code>e</code>, but it is referenced only by <code>HEAD</code>. We can
 979 of course add yet another commit in this state:</p>
 980 </div>
 981 <div class="listingblock">
 982 <div class="content">
 983 <pre>$ edit; git add; git commit
 984
 985          HEAD (refers to commit 'f')
 986           |
 987           v
 988       e---f
 989      /
 990 a---b---c---d  branch 'master' (refers to commit 'd')
 991     ^
 992     |
 993   tag 'v2.0' (refers to commit 'b')</pre>
 994 </div>
 995 </div>
 996 <div class="paragraph">
 997 <p>In fact, we can perform all the normal Git operations. But, let&#8217;s look
 998 at what happens when we then checkout <code>master</code>:</p>
 999 </div>
1000 <div class="listingblock">
1001 <div class="content">
1002 <pre>$ git checkout master
1003
1004                HEAD (refers to branch 'master')
1005       e---f     |
1006      /          v
1007 a---b---c---d  branch 'master' (refers to commit 'd')
1008     ^
1009     |
1010   tag 'v2.0' (refers to commit 'b')</pre>
1011 </div>
1012 </div>
1013 <div class="paragraph">
1014 <p>It is important to realize that at this point nothing refers to commit
1015 <code>f</code>. Eventually commit <code>f</code> (and by extension commit <code>e</code>) will be deleted
1016 by the routine Git garbage collection process, unless we create a reference
1017 before that happens. If we have not yet moved away from commit <code>f</code>,
1018 any of these will create a reference to it:</p>
1019 </div>
1020 <div class="listingblock">
1021 <div class="content">
1022 <pre>$ git checkout -b foo  # or "git switch -c foo"  <b class="conum">(1)</b>
1023 $ git branch foo                                 <b class="conum">(2)</b>
1024 $ git tag foo                                    <b class="conum">(3)</b></pre>
1025 </div>
1026 </div>
1027 <div class="colist arabic">
1028 <ol>
1029 <li>
1030 <p>creates a new branch <code>foo</code>, which refers to commit <code>f</code>, and then
1031 updates <code>HEAD</code> to refer to branch <code>foo</code>. In other words, we&#8217;ll no longer
1032 be in detached <code>HEAD</code> state after this command.</p>
1033 </li>
1034 <li>
1035 <p>similarly creates a new branch <code>foo</code>, which refers to commit <code>f</code>,
1036 but leaves <code>HEAD</code> detached.</p>
1037 </li>
1038 <li>
1039 <p>creates a new tag <code>foo</code>, which refers to commit <code>f</code>,
1040 leaving <code>HEAD</code> detached.</p>
1041 </li>
1042 </ol>
1043 </div>
1044 <div class="paragraph">
1045 <p>If we have moved away from commit <code>f</code>, then we must first recover its object
1046 name (typically by using git reflog), and then we can create a reference to
1047 it. For example, to see the last two commits to which <code>HEAD</code> referred, we
1048 can use either of these commands:</p>
1049 </div>
1050 <div class="listingblock">
1051 <div class="content">
1052 <pre>$ git reflog -2 HEAD # or
1053 $ git log -g -2 HEAD</pre>
1054 </div>
1055 </div>
1056 </div>
1057 </div>
1058 <div class="sect1">
1059 <h2 id="_argument_disambiguation">ARGUMENT DISAMBIGUATION</h2>
1060 <div class="sectionbody">
1061 <div class="paragraph">
1062 <p>When there is only one argument given and it is not <code>--</code> (e.g. <code>git</code>
1063 <code>checkout</code> <code>abc</code>), and when the argument is both a valid <em>&lt;tree-ish&gt;</em>
1064 (e.g. a branch <code>abc</code> exists) and a valid <em>&lt;pathspec&gt;</em> (e.g. a file
1065 or a directory whose name is "abc" exists), Git would usually ask
1066 you to disambiguate.  Because checking out a branch is so common an
1067 operation, however, <code>git</code> <code>checkout</code> <code>abc</code> takes "abc" as a <em>&lt;tree-ish&gt;</em>
1068 in such a situation.  Use <code>git</code> <code>checkout</code> <code>--</code> <em>&lt;pathspec&gt;</em> if you want
1069 to checkout these paths out of the index.</p>
1070 </div>
1071 </div>
1072 </div>
1073 <div class="sect1">
1074 <h2 id="_examples">EXAMPLES</h2>
1075 <div class="sectionbody">
1076 <div class="sect2">
1077 <h3 id="_1_paths">1. Paths</h3>
1078 <div class="paragraph">
1079 <p>The following sequence checks out the <code>master</code> branch, reverts
1080 the <code>Makefile</code> to two revisions back, deletes <code>hello.c</code> by
1081 mistake, and gets it back from the index.</p>
1082 </div>
1083 <div class="listingblock">
1084 <div class="content">
1085 <pre>$ git checkout master             <b class="conum">(1)</b>
1086 $ git checkout master~2 Makefile  <b class="conum">(2)</b>
1087 $ rm -f hello.c
1088 $ git checkout hello.c            <b class="conum">(3)</b></pre>
1089 </div>
1090 </div>
1091 <div class="colist arabic">
1092 <ol>
1093 <li>
1094 <p>switch branch</p>
1095 </li>
1096 <li>
1097 <p>take a file out of another commit</p>
1098 </li>
1099 <li>
1100 <p>restore <code>hello.c</code> from the index</p>
1101 </li>
1102 </ol>
1103 </div>
1104 <div class="paragraph">
1105 <p>If you want to check out <em>all</em> C source files out of the index,
1106 you can say</p>
1107 </div>
1108 <div class="listingblock">
1109 <div class="content">
1110 <pre>$ git checkout -- '*.c'</pre>
1111 </div>
1112 </div>
1113 <div class="paragraph">
1114 <p>Note the quotes around *.<code>c</code>.  The file <code>hello.c</code> will also be
1115 checked out, even though it is no longer in the working tree,
1116 because the file globbing is used to match entries in the index
1117 (not in the working tree by the shell).</p>
1118 </div>
1119 <div class="paragraph">
1120 <p>If you have an unfortunate branch that is named <code>hello.c</code>, this
1121 step would be confused as an instruction to switch to that branch.
1122 You should instead write:</p>
1123 </div>
1124 <div class="listingblock">
1125 <div class="content">
1126 <pre>$ git checkout -- hello.c</pre>
1127 </div>
1128 </div>
1129 </div>
1130 <div class="sect2">
1131 <h3 id="_2_merge">2. Merge</h3>
1132 <div class="paragraph">
1133 <p>After working in the wrong branch, switching to the correct
1134 branch would be done using:</p>
1135 </div>
1136 <div class="listingblock">
1137 <div class="content">
1138 <pre>$ git checkout mytopic</pre>
1139 </div>
1140 </div>
1141 <div class="paragraph">
1142 <p>However, your "wrong" branch and correct <code>mytopic</code> branch may
1143 differ in files that you have modified locally, in which case
1144 the above checkout would fail like this:</p>
1145 </div>
1146 <div class="listingblock">
1147 <div class="content">
1148 <pre>$ git checkout mytopic
1149 error: You have local changes to 'frotz'; not switching branches.</pre>
1150 </div>
1151 </div>
1152 <div class="paragraph">
1153 <p>You can give the <code>-m</code> flag to the command, which would try a
1154 three-way merge:</p>
1155 </div>
1156 <div class="listingblock">
1157 <div class="content">
1158 <pre>$ git checkout -m mytopic
1159 Auto-merging frotz</pre>
1160 </div>
1161 </div>
1162 <div class="paragraph">
1163 <p>After this three-way merge, the local modifications are <em>not</em>
1164 registered in your index file, so <code>git</code> <code>diff</code> would show you what
1165 changes you made since the tip of the new branch.</p>
1166 </div>
1167 </div>
1168 <div class="sect2">
1169 <h3 id="_3_merge_conflict">3. Merge conflict</h3>
1170 <div class="paragraph">
1171 <p>When a merge conflict happens during switching branches with
1172 the <code>-m</code> option, you would see something like this:</p>
1173 </div>
1174 <div class="listingblock">
1175 <div class="content">
1176 <pre>$ git checkout -m mytopic
1177 Auto-merging frotz
1178 ERROR: Merge conflict in frotz
1179 fatal: merge program failed</pre>
1180 </div>
1181 </div>
1182 <div class="paragraph">
1183 <p>At this point, <code>git</code> <code>diff</code> shows the changes cleanly merged as in
1184 the previous example, as well as the changes in the conflicted
1185 files.  Edit and resolve the conflict and mark it resolved with
1186 <code>git</code> <code>add</code> as usual:</p>
1187 </div>
1188 <div class="listingblock">
1189 <div class="content">
1190 <pre>$ edit frotz
1191 $ git add frotz</pre>
1192 </div>
1193 </div>
1194 </div>
1195 </div>
1196 </div>
1197 <div class="sect1">
1198 <h2 id="_configuration">CONFIGURATION</h2>
1199 <div class="sectionbody">
1200 <div class="paragraph">
1201 <p>Everything below this line in this section is selectively included
1202 from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
1203 as what&#8217;s found there:</p>
1204 </div>
1205 <div class="dlist">
1206 <dl>
1207 <dt class="hdlist1">checkout.defaultRemote</dt>
1208 <dd>
1209 <p>When you run <code>git</code> <code>checkout</code> <em>&lt;something&gt;</em>
1210 or <code>git</code> <code>switch</code> <em>&lt;something&gt;</em> and only have one
1211 remote, it may implicitly fall back on checking out and
1212 tracking e.g. <code>origin/</code><em>&lt;something&gt;</em>. This stops working as soon
1213 as you have more than one remote with a <em>&lt;something&gt;</em>
1214 reference. This setting allows for setting the name of a
1215 preferred remote that should always win when it comes to
1216 disambiguation. The typical use-case is to set this to
1217 <code>origin</code>.</p>
1218 <div class="paragraph">
1219 <p>Currently this is used by <a href="git-switch.html">git-switch(1)</a> and
1220 <a href="git-checkout.html">git-checkout(1)</a> when <code>git</code> <code>checkout</code> <em>&lt;something&gt;</em>
1221 or <code>git</code> <code>switch</code> <em>&lt;something&gt;</em>
1222 will checkout the <em>&lt;something&gt;</em> branch on another remote,
1223 and by <a href="git-worktree.html">git-worktree(1)</a> when <code>git</code> <code>worktree</code> <code>add</code> refers to a
1224 remote branch. This setting might be used for other checkout-like
1225 commands or functionality in the future.</p>
1226 </div>
1227 </dd>
1228 <dt class="hdlist1">checkout.guess</dt>
1229 <dd>
1230 <p>Provides the default value for the <code>--guess</code> or <code>--no-guess</code>
1231 option in <code>git</code> <code>checkout</code> and <code>git</code> <code>switch</code>. See
1232 <a href="git-switch.html">git-switch(1)</a> and <a href="git-checkout.html">git-checkout(1)</a>.</p>
1233 </dd>
1234 <dt class="hdlist1">checkout.workers</dt>
1235 <dd>
1236 <p>The number of parallel workers to use when updating the working tree.
1237 The default is one, i.e. sequential execution. If set to a value less
1238 than one, Git will use as many workers as the number of logical cores
1239 available. This setting and <code>checkout.thresholdForParallelism</code> affect
1240 all commands that perform checkout. E.g. checkout, clone, reset,
1241 sparse-checkout, etc.</p>
1242 <div class="paragraph">
1243 <p>Note: Parallel checkout usually delivers better performance for repositories
1244 located on SSDs or over NFS. For repositories on spinning disks and/or machines
1245 with a small number of cores, the default sequential checkout often performs
1246 better. The size and compression level of a repository might also influence how
1247 well the parallel version performs.</p>
1248 </div>
1249 </dd>
1250 <dt class="hdlist1">checkout.thresholdForParallelism</dt>
1251 <dd>
1252 <p>When running parallel checkout with a small number of files, the cost
1253 of subprocess spawning and inter-process communication might outweigh
1254 the parallelization gains. This setting allows you to define the minimum
1255 number of files for which parallel checkout should be attempted. The
1256 default is 100.</p>
1257 </dd>
1258 </dl>
1259 </div>
1260 </div>
1261 </div>
1262 <div class="sect1">
1263 <h2 id="_see_also">SEE ALSO</h2>
1264 <div class="sectionbody">
1265 <div class="paragraph">
1266 <p><a href="git-switch.html">git-switch(1)</a>,
1267 <a href="git-restore.html">git-restore(1)</a></p>
1268 </div>
1269 </div>
1270 </div>
1271 <div class="sect1">
1272 <h2 id="_git">GIT</h2>
1273 <div class="sectionbody">
1274 <div class="paragraph">
1275 <p>Part of the <a href="git.html">git(1)</a> suite</p>
1276 </div>
1277 </div>
1278 </div>
1279 </div>
1280 <div id="footer">
1281 <div id="footer-text">
1282 Last updated 2024-11-01 22:46:55 -0700
1283 </div>
1284 </div>
1285 </body>
1286 </html>