| <!DOCTYPE html> |
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
| <head> |
| <meta charset="UTF-8"/> |
| <meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
| <meta name="viewport" content="width=device-width, initial-scale=1.0"/> |
| <meta name="generator" content="Asciidoctor 2.0.23"/> |
| <title>git-reset(1)</title> |
| <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"/> |
| <style> |
| /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ |
| /* Uncomment the following line when using as a custom stylesheet */ |
| /* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"; */ |
| html{font-family:sans-serif;-webkit-text-size-adjust:100%} |
| a{background:none} |
| a:focus{outline:thin dotted} |
| a:active,a:hover{outline:0} |
| h1{font-size:2em;margin:.67em 0} |
| b,strong{font-weight:bold} |
| abbr{font-size:.9em} |
| abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none} |
| dfn{font-style:italic} |
| hr{height:0} |
| mark{background:#ff0;color:#000} |
| code,kbd,pre,samp{font-family:monospace;font-size:1em} |
| pre{white-space:pre-wrap} |
| q{quotes:"\201C" "\201D" "\2018" "\2019"} |
| small{font-size:80%} |
| sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} |
| sup{top:-.5em} |
| sub{bottom:-.25em} |
| img{border:0} |
| svg:not(:root){overflow:hidden} |
| figure{margin:0} |
| audio,video{display:inline-block} |
| audio:not([controls]){display:none;height:0} |
| fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} |
| legend{border:0;padding:0} |
| button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} |
| button,input{line-height:normal} |
| button,select{text-transform:none} |
| button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} |
| button[disabled],html input[disabled]{cursor:default} |
| input[type=checkbox],input[type=radio]{padding:0} |
| button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} |
| textarea{overflow:auto;vertical-align:top} |
| table{border-collapse:collapse;border-spacing:0} |
| *,::before,::after{box-sizing:border-box} |
| html,body{font-size:100%} |
| body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} |
| a:hover{cursor:pointer} |
| img,object,embed{max-width:100%;height:auto} |
| object,embed{height:100%} |
| img{-ms-interpolation-mode:bicubic} |
| .left{float:left!important} |
| .right{float:right!important} |
| .text-left{text-align:left!important} |
| .text-right{text-align:right!important} |
| .text-center{text-align:center!important} |
| .text-justify{text-align:justify!important} |
| .hide{display:none} |
| img,object,svg{display:inline-block;vertical-align:middle} |
| textarea{height:auto;min-height:50px} |
| select{width:100%} |
| .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em} |
| div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0} |
| a{color:#2156a5;text-decoration:underline;line-height:inherit} |
| a:hover,a:focus{color:#1d4b8f} |
| a img{border:0} |
| p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} |
| p aside{font-size:.875em;line-height:1.35;font-style:italic} |
| h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em} |
| h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0} |
| h1{font-size:2.125em} |
| h2{font-size:1.6875em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em} |
| h4,h5{font-size:1.125em} |
| h6{font-size:1em} |
| hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em} |
| em,i{font-style:italic;line-height:inherit} |
| strong,b{font-weight:bold;line-height:inherit} |
| small{font-size:60%;line-height:inherit} |
| code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)} |
| ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} |
| ul,ol{margin-left:1.5em} |
| ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0} |
| ul.circle{list-style-type:circle} |
| ul.disc{list-style-type:disc} |
| ul.square{list-style-type:square} |
| ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit} |
| ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} |
| dl dt{margin-bottom:.3125em;font-weight:bold} |
| dl dd{margin-bottom:1.25em} |
| blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd} |
| blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)} |
| @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2} |
| h1{font-size:2.75em} |
| h2{font-size:2.3125em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em} |
| h4{font-size:1.4375em}} |
| table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal} |
| table thead,table tfoot{background:#f7f8f7} |
| table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left} |
| table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)} |
| table tr.even,table tr.alt{background:#f8f8f7} |
| table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6} |
| h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em} |
| h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400} |
| .center{margin-left:auto;margin-right:auto} |
| .stretch{width:100%} |
| .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table} |
| .clearfix::after,.float-group::after{clear:both} |
| :not(pre).nobreak{word-wrap:normal} |
| :not(pre).nowrap{white-space:nowrap} |
| :not(pre).pre-wrap{white-space:pre-wrap} |
| :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed} |
| pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} |
| pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} |
| pre>code{display:block} |
| pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} |
| em em{font-style:normal} |
| strong strong{font-weight:400} |
| .keyseq{color:rgba(51,51,51,.8)} |
| kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap} |
| .keyseq kbd:first-child{margin-left:0} |
| .keyseq kbd:last-child{margin-right:0} |
| .menuseq,.menuref{color:#000} |
| .menuseq b:not(.caret),.menuref{font-weight:inherit} |
| .menuseq{word-spacing:-.02em} |
| .menuseq b.caret{font-size:1.25em;line-height:.8} |
| .menuseq i.caret{font-weight:bold;text-align:center;width:.45em} |
| b.button::before,b.button::after{position:relative;top:-1px;font-weight:400} |
| b.button::before{content:"[";padding:0 3px 0 2px} |
| b.button::after{content:"]";padding:0 2px 0 3px} |
| p a>code:hover{color:rgba(0,0,0,.9)} |
| #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em} |
| #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table} |
| #header::after,#content::after,#footnotes::after,#footer::after{clear:both} |
| #content{margin-top:1.25em} |
| #content::before{content:none} |
| #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0} |
| #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf} |
| #header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap} |
| #header .details span:first-child{margin-left:-.125em} |
| #header .details span.email a{color:rgba(0,0,0,.85)} |
| #header .details br{display:none} |
| #header .details br+span::before{content:"\00a0\2013\00a0"} |
| #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)} |
| #header .details br+span#revremark::before{content:"\00a0|\00a0"} |
| #header #revnumber{text-transform:capitalize} |
| #header #revnumber::after{content:"\00a0"} |
| #content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem} |
| #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em} |
| #toc>ul{margin-left:.125em} |
| #toc ul.sectlevel0>li>a{font-style:italic} |
| #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0} |
| #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none} |
| #toc li{line-height:1.3334;margin-top:.3334em} |
| #toc a{text-decoration:none} |
| #toc a:active{text-decoration:underline} |
| #toctitle{color:#7a2518;font-size:1.2em} |
| @media screen and (min-width:768px){#toctitle{font-size:1.375em} |
| body.toc2{padding-left:15em;padding-right:0} |
| body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto} |
| #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} |
| #toc.toc2>ul{font-size:.9em;margin-bottom:0} |
| #toc.toc2 ul ul{margin-left:0;padding-left:1em} |
| #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} |
| body.toc2.toc-right{padding-left:0;padding-right:15em} |
| body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} |
| @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} |
| #toc.toc2{width:20em} |
| #toc.toc2 #toctitle{font-size:1.375em} |
| #toc.toc2>ul{font-size:.95em} |
| #toc.toc2 ul ul{padding-left:1.25em} |
| body.toc2.toc-right{padding-left:0;padding-right:20em}} |
| #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px} |
| #content #toc>:first-child{margin-top:0} |
| #content #toc>:last-child{margin-bottom:0} |
| #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} |
| #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44} |
| #content{margin-bottom:.625em} |
| .sect1{padding-bottom:.625em} |
| @media screen and (min-width:768px){#content{margin-bottom:1.25em} |
| .sect1{padding-bottom:1.25em}} |
| .sect1:last-child{padding-bottom:0} |
| .sect1+.sect1{border-top:1px solid #e7e7e9} |
| #content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400} |
| #content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em} |
| #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible} |
| #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none} |
| #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221} |
| details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} |
| details{margin-left:1.25rem} |
| details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent} |
| details>summary::-webkit-details-marker{display:none} |
| details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)} |
| details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)} |
| details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem} |
| .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic} |
| table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} |
| .paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)} |
| .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} |
| .admonitionblock>table td.icon{text-align:center;width:80px} |
| .admonitionblock>table td.icon img{max-width:none} |
| .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} |
| .admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere} |
| .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} |
| .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px} |
| .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px} |
| .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} |
| .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0} |
| .exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0} |
| .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} |
| @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} |
| @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} |
| .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
| .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
| .listingblock>.content{position:relative} |
| .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5} |
| .listingblock:hover code[data-lang]::before{display:block} |
| .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
| .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} |
| .listingblock pre.highlightjs{padding:0} |
| .listingblock pre.highlightjs>code{padding:1em;border-radius:4px} |
| .listingblock pre.prettyprint{border-width:0} |
| .prettyprint{background:#f7f7f8} |
| pre.prettyprint .linenums{line-height:1.45;margin-left:2em} |
| pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} |
| pre.prettyprint li code[data-lang]::before{opacity:1} |
| pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} |
| table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} |
| table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} |
| table.linenotable td.code{padding-left:.75em} |
| table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} |
| pre.pygments span.linenos{display:inline-block;margin-right:.75em} |
| .quoteblock{margin:0 1em 1.25em 1.5em;display:table} |
| .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} |
| .quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify} |
| .quoteblock blockquote{margin:0;padding:0;border:0} |
| .quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)} |
| .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} |
| .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} |
| .verseblock{margin:0 1em 1.25em} |
| .verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility} |
| .verseblock pre strong{font-weight:400} |
| .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} |
| .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} |
| .quoteblock .attribution br,.verseblock .attribution br{display:none} |
| .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} |
| .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} |
| .quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0} |
| .quoteblock.abstract{margin:0 1em 1.25em;display:block} |
| .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} |
| .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} |
| .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} |
| .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} |
| .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} |
| p.tableblock:last-child{margin-bottom:0} |
| td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} |
| td.tableblock>.content>:last-child{margin-bottom:-1.25em} |
| table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} |
| table.grid-all>*>tr>*{border-width:1px} |
| table.grid-cols>*>tr>*{border-width:0 1px} |
| table.grid-rows>*>tr>*{border-width:1px 0} |
| table.frame-all{border-width:1px} |
| table.frame-ends{border-width:1px 0} |
| table.frame-sides{border-width:0 1px} |
| table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} |
| table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} |
| table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} |
| table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} |
| table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7} |
| th.halign-left,td.halign-left{text-align:left} |
| th.halign-right,td.halign-right{text-align:right} |
| th.halign-center,td.halign-center{text-align:center} |
| th.valign-top,td.valign-top{vertical-align:top} |
| th.valign-bottom,td.valign-bottom{vertical-align:bottom} |
| th.valign-middle,td.valign-middle{vertical-align:middle} |
| table thead th,table tfoot th{font-weight:bold} |
| tbody tr th{background:#f7f8f7} |
| tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} |
| p.tableblock>code:only-child{background:none;padding:0} |
| p.tableblock{font-size:1em} |
| ol{margin-left:1.75em} |
| ul li ol{margin-left:1.5em} |
| dl dd{margin-left:1.125em} |
| dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} |
| li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} |
| ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} |
| ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} |
| ul.unstyled,ol.unstyled{margin-left:0} |
| li>p:empty:only-child::before{content:"";display:inline-block} |
| ul.checklist>li>p:first-child{margin-left:-1em} |
| ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em} |
| ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em} |
| ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} |
| ul.inline>li{margin-left:1.25em} |
| .unstyled dl dt{font-weight:400;font-style:normal} |
| ol.arabic{list-style-type:decimal} |
| ol.decimal{list-style-type:decimal-leading-zero} |
| ol.loweralpha{list-style-type:lower-alpha} |
| ol.upperalpha{list-style-type:upper-alpha} |
| ol.lowerroman{list-style-type:lower-roman} |
| ol.upperroman{list-style-type:upper-roman} |
| ol.lowergreek{list-style-type:lower-greek} |
| .hdlist>table,.colist>table{border:0;background:none} |
| .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} |
| td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} |
| td.hdlist1{font-weight:bold;padding-bottom:1.25em} |
| td.hdlist2{word-wrap:anywhere} |
| .literalblock+.colist,.listingblock+.colist{margin-top:-.5em} |
| .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} |
| .colist td:not([class]):first-child img{max-width:none} |
| .colist td:not([class]):last-child{padding:.25em 0} |
| .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd} |
| .imageblock.left{margin:.25em .625em 1.25em 0} |
| .imageblock.right{margin:.25em 0 1.25em .625em} |
| .imageblock>.title{margin-bottom:0} |
| .imageblock.thumb,.imageblock.th{border-width:6px} |
| .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} |
| .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} |
| .image.left{margin-right:.625em} |
| .image.right{margin-left:.625em} |
| a.image{text-decoration:none;display:inline-block} |
| a.image object{pointer-events:none} |
| sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} |
| sup.footnote a,sup.footnoteref a{text-decoration:none} |
| sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline} |
| #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} |
| #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} |
| #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} |
| #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} |
| #footnotes .footnote:last-of-type{margin-bottom:0} |
| #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} |
| div.unbreakable{page-break-inside:avoid} |
| .big{font-size:larger} |
| .small{font-size:smaller} |
| .underline{text-decoration:underline} |
| .overline{text-decoration:overline} |
| .line-through{text-decoration:line-through} |
| .aqua{color:#00bfbf} |
| .aqua-background{background:#00fafa} |
| .black{color:#000} |
| .black-background{background:#000} |
| .blue{color:#0000bf} |
| .blue-background{background:#0000fa} |
| .fuchsia{color:#bf00bf} |
| .fuchsia-background{background:#fa00fa} |
| .gray{color:#606060} |
| .gray-background{background:#7d7d7d} |
| .green{color:#006000} |
| .green-background{background:#007d00} |
| .lime{color:#00bf00} |
| .lime-background{background:#00fa00} |
| .maroon{color:#600000} |
| .maroon-background{background:#7d0000} |
| .navy{color:#000060} |
| .navy-background{background:#00007d} |
| .olive{color:#606000} |
| .olive-background{background:#7d7d00} |
| .purple{color:#600060} |
| .purple-background{background:#7d007d} |
| .red{color:#bf0000} |
| .red-background{background:#fa0000} |
| .silver{color:#909090} |
| .silver-background{background:#bcbcbc} |
| .teal{color:#006060} |
| .teal-background{background:#007d7d} |
| .white{color:#bfbfbf} |
| .white-background{background:#fafafa} |
| .yellow{color:#bfbf00} |
| .yellow-background{background:#fafa00} |
| span.icon>.fa{cursor:default} |
| a span.icon>.fa{cursor:inherit} |
| .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} |
| .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} |
| .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} |
| .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} |
| .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} |
| .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} |
| .conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold} |
| .conum[data-value] *{color:#fff!important} |
| .conum[data-value]+b{display:none} |
| .conum[data-value]::after{content:attr(data-value)} |
| pre .conum[data-value]{position:relative;top:-.125em} |
| b.conum *{color:inherit!important} |
| .conum:not([data-value]):empty{display:none} |
| dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} |
| h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em} |
| p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} |
| p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem} |
| p{margin-bottom:1.25rem} |
| .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} |
| .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc} |
| .print-only{display:none!important} |
| @page{margin:1.25cm .75cm} |
| @media print{*{box-shadow:none!important;text-shadow:none!important} |
| html{font-size:80%} |
| a{color:inherit!important;text-decoration:underline!important} |
| a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} |
| a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} |
| abbr[title]{border-bottom:1px dotted} |
| abbr[title]::after{content:" (" attr(title) ")"} |
| pre,blockquote,tr,img,object,svg{page-break-inside:avoid} |
| thead{display:table-header-group} |
| svg{max-width:100%} |
| p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} |
| h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} |
| #header,#content,#footnotes,#footer{max-width:none} |
| #toc,.sidebarblock,.exampleblock>.content{background:none!important} |
| #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} |
| body.book #header{text-align:center} |
| body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} |
| body.book #header .details{border:0!important;display:block;padding:0!important} |
| body.book #header .details span:first-child{margin-left:0!important} |
| body.book #header .details br{display:block} |
| body.book #header .details br+span::before{content:none!important} |
| body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} |
| body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} |
| .listingblock code[data-lang]::before{display:block} |
| #footer{padding:0 .9375em} |
| .hide-on-print{display:none!important} |
| .print-only{display:block!important} |
| .hide-for-print{display:none!important} |
| .show-for-print{display:inherit!important}} |
| @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem} |
| .sect1{padding:0!important} |
| .sect1+.sect1{border:0} |
| #footer{background:none} |
| #footer-text{color:rgba(0,0,0,.6);font-size:.9em}} |
| @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} |
| </style> |
| <style> |
| pre>code { |
| display: inline; |
| } |
| </style> |
| </head> |
| <body class="manpage"> |
| <div id="header"> |
| <h1>git-reset(1) Manual Page</h1> |
| <h2 id="_name">NAME</h2> |
| <div class="sectionbody"> |
| <p>git-reset - Reset current HEAD to the specified state</p> |
| </div> |
| </div> |
| <div id="content"> |
| <div class="sect1"> |
| <h2 id="_synopsis">SYNOPSIS</h2> |
| <div class="sectionbody"> |
| <div class="verseblock"> |
| <pre class="content"><code>git</code> <code>reset</code> [<code>-q</code>] [<em><tree-ish></em>] [<code>--</code>] <em><pathspec></em>…​ |
| <code>git</code> <code>reset</code> [<code>-q</code>] [<code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]] [<em><tree-ish></em>] |
| <code>git</code> <code>reset</code> (<code>--patch</code> | <code>-p</code>) [<em><tree-ish></em>] [<code>--</code>] [<em><pathspec></em>…​] |
| <code>git</code> <code>reset</code> [<code>--soft</code> | <code>--mixed</code> [<code>-N</code>] | <code>--hard</code> | <code>--merge</code> | <code>--keep</code>] [<code>-q</code>] [<em><commit></em>]</pre> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_description">DESCRIPTION</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>In the first three forms, copy entries from <em><tree-ish></em> to the index. |
| In the last form, set the current branch head (<code>HEAD</code>) to <em><commit></em>, |
| optionally modifying index and working tree to match. |
| The <em><tree-ish></em>/<em><commit></em> defaults to <code>HEAD</code> in all forms.</p> |
| </div> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1"><code>git</code> <code>reset</code> [<code>-q</code>] [<em><tree-ish></em>] [<code>--</code>] <em><pathspec></em>...</dt> |
| <dt class="hdlist1"><code>git</code> <code>reset</code> [<code>-q</code>] [<code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]] [<em><tree-ish></em>]</dt> |
| <dd> |
| <p>These forms reset the index entries for all paths that match the |
| <em><pathspec></em> to their state at <em><tree-ish></em>. (It does not affect |
| the working tree or the current branch.)</p> |
| <div class="paragraph"> |
| <p>This means that <code>git</code> <code>reset</code> <em><pathspec></em> is the opposite of <code>git</code> <code>add</code> |
| <em><pathspec></em>. This command is equivalent to |
| <code>git</code> <code>restore</code> [<code>--source=</code><em><tree-ish></em>] <code>--staged</code> <em><pathspec></em>....</p> |
| </div> |
| <div class="paragraph"> |
| <p>After running <code>git</code> <code>reset</code> <em><pathspec></em> to update the index entry, you can |
| use <a href="git-restore.html">git-restore(1)</a> to check the contents out of the index to |
| the working tree. Alternatively, using <a href="git-restore.html">git-restore(1)</a> |
| and specifying a commit with <code>--source</code>, you |
| can copy the contents of a path out of a commit to the index and to the |
| working tree in one go.</p> |
| </div> |
| </dd> |
| <dt class="hdlist1"><code>git</code> <code>reset</code> (<code>--patch</code> | <code>-p</code>) [<em><tree-ish></em>] [<code>--</code>] [<em><pathspec></em>...]</dt> |
| <dd> |
| <p>Interactively select hunks in the difference between the index |
| and <em><tree-ish></em> (defaults to <code>HEAD</code>). The chosen hunks are applied |
| in reverse to the index.</p> |
| <div class="paragraph"> |
| <p>This means that <code>git</code> <code>reset</code> <code>-p</code> is the opposite of <code>git</code> <code>add</code> <code>-p</code>, i.e. |
| you can use it to selectively reset hunks. See the "Interactive Mode" |
| section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p> |
| </div> |
| </dd> |
| <dt class="hdlist1"><code>git</code> <code>reset</code> [<em><mode></em>] [<em><commit></em>]</dt> |
| <dd> |
| <p>This form resets the current branch head to <em><commit></em> and |
| possibly updates the index (resetting it to the tree of <em><commit></em>) and |
| the working tree depending on <em><mode></em>. Before the operation, <code>ORIG_HEAD</code> |
| is set to the tip of the current branch. If <em><mode></em> is omitted, |
| defaults to <code>--mixed</code>. The <em><mode></em> must be one of the following:</p> |
| <div class="openblock"> |
| <div class="content"> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1"><code>--soft</code></dt> |
| <dd> |
| <p>Does not touch the index file or the working tree at all (but |
| resets the head to <em><commit></em>, just like all modes do). This leaves |
| all your changed files "Changes to be committed", as <code>git</code> <code>status</code> |
| would put it.</p> |
| </dd> |
| <dt class="hdlist1"><code>--mixed</code></dt> |
| <dd> |
| <p>Resets the index but not the working tree (i.e., the changed files |
| are preserved but not marked for commit) and reports what has not |
| been updated. This is the default action.</p> |
| <div class="paragraph"> |
| <p>If <code>-N</code> is specified, removed paths are marked as intent-to-add (see |
| <a href="git-add.html">git-add(1)</a>).</p> |
| </div> |
| </dd> |
| <dt class="hdlist1"><code>--hard</code></dt> |
| <dd> |
| <p>Resets the index and working tree. Any changes to tracked files in the |
| working tree since <em><commit></em> are discarded. Any untracked files or |
| directories in the way of writing any tracked files are simply deleted.</p> |
| </dd> |
| <dt class="hdlist1"><code>--merge</code></dt> |
| <dd> |
| <p>Resets the index and updates the files in the working tree that are |
| different between <em><commit></em> and <code>HEAD</code>, but keeps those which are |
| different between the index and working tree (i.e. which have changes |
| which have not been added). |
| If a file that is different between <em><commit></em> and the index has |
| unstaged changes, reset is aborted.</p> |
| <div class="paragraph"> |
| <p>In other words, <code>--merge</code> does something like a <code>git</code> <code>read-tree</code> <code>-u</code> <code>-m</code> <em><commit></em>, |
| but carries forward unmerged index entries.</p> |
| </div> |
| </dd> |
| <dt class="hdlist1"><code>--keep</code></dt> |
| <dd> |
| <p>Resets index entries and updates files in the working tree that are |
| different between <em><commit></em> and <code>HEAD</code>. |
| If a file that is different between <em><commit></em> and <code>HEAD</code> has local |
| changes, reset is aborted.</p> |
| </dd> |
| <dt class="hdlist1"><code>--</code>[<code>no-</code>]<code>recurse-submodules</code></dt> |
| <dd> |
| <p>When the working tree is updated, using <code>--recurse-submodules</code> will |
| also recursively reset the working tree of all active submodules |
| according to the commit recorded in the superproject, also setting |
| the submodules' <code>HEAD</code> to be detached at that commit.</p> |
| </dd> |
| </dl> |
| </div> |
| </div> |
| </div> |
| </dd> |
| </dl> |
| </div> |
| <div class="paragraph"> |
| <p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences |
| between the three commands.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_options">OPTIONS</h2> |
| <div class="sectionbody"> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1"><code>-q</code></dt> |
| <dt class="hdlist1"><code>--quiet</code></dt> |
| <dd> |
| <p>Be quiet, only report errors.</p> |
| </dd> |
| <dt class="hdlist1"><code>--refresh</code></dt> |
| <dt class="hdlist1"><code>--no-refresh</code></dt> |
| <dd> |
| <p>Refresh the index after a mixed reset. Enabled by default.</p> |
| </dd> |
| <dt class="hdlist1"><code>--pathspec-from-file=</code><em><file></em></dt> |
| <dd> |
| <p>Pathspec is passed in <em><file></em> instead of commandline args. If |
| <em><file></em> is exactly <code>-</code> then standard input is used. Pathspec |
| elements are separated by <em>LF</em> or <em>CR</em>/<em>LF</em>. Pathspec elements can be |
| quoted as explained for the configuration variable <code>core.quotePath</code> |
| (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and |
| global <code>--literal-pathspecs</code>.</p> |
| </dd> |
| <dt class="hdlist1"><code>--pathspec-file-nul</code></dt> |
| <dd> |
| <p>Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are |
| separated with <em>NUL</em> character and all other characters are taken |
| literally (including newlines and quotes).</p> |
| </dd> |
| <dt class="hdlist1"><code>--</code></dt> |
| <dd> |
| <p>Do not interpret any more arguments as options.</p> |
| </dd> |
| <dt class="hdlist1"><em><pathspec></em>...</dt> |
| <dd> |
| <p>Limits the paths affected by the operation.</p> |
| <div class="paragraph"> |
| <p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p> |
| </div> |
| </dd> |
| </dl> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_examples">EXAMPLES</h2> |
| <div class="sectionbody"> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1">Undo add</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ edit <b class="conum">(1)</b> |
| $ git add frotz.c filfre.c |
| $ mailx <b class="conum">(2)</b> |
| $ git reset <b class="conum">(3)</b> |
| $ git pull git://info.example.com/ nitfol <b class="conum">(4)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>You are happily working on something, and find the changes |
| in these files are in good order. You do not want to see them |
| when you run <code>git</code> <code>diff</code>, because you plan to work on other files |
| and changes with these files are distracting.</p> |
| </li> |
| <li> |
| <p>Somebody asks you to pull, and the changes sound worthy of merging.</p> |
| </li> |
| <li> |
| <p>However, you already dirtied the index (i.e. your index does |
| not match the <code>HEAD</code> commit). But you know the pull you are going |
| to make does not affect <code>frotz.c</code> or <code>filfre.c</code>, so you revert the |
| index changes for these two files. Your changes in working tree |
| remain there.</p> |
| </li> |
| <li> |
| <p>Then you can pull and merge, leaving <code>frotz.c</code> and <code>filfre.c</code> |
| changes still in the working tree.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Undo a commit and redo</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git commit ... |
| $ git reset --soft HEAD^ <b class="conum">(1)</b> |
| $ edit <b class="conum">(2)</b> |
| $ git commit -a -c ORIG_HEAD <b class="conum">(3)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>This is most often done when you remembered what you |
| just committed is incomplete, or you misspelled your commit |
| message, or both. Leaves working tree as it was before "reset".</p> |
| </li> |
| <li> |
| <p>Make corrections to working tree files.</p> |
| </li> |
| <li> |
| <p>"reset" copies the old head to .<code>git/ORIG_HEAD</code>; redo the |
| commit by starting with its log message. If you do not need to |
| edit the message further, you can give <code>-C</code> option instead.</p> |
| <div class="paragraph"> |
| <p>See also the <code>--amend</code> option to <a href="git-commit.html">git-commit(1)</a>.</p> |
| </div> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Undo a commit, making it a topic branch</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git branch topic/wip <b class="conum">(1)</b> |
| $ git reset --hard HEAD~3 <b class="conum">(2)</b> |
| $ git switch topic/wip <b class="conum">(3)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>You have made some commits, but realize they were premature |
| to be in the <code>master</code> branch. You want to continue polishing |
| them in a topic branch, so create <code>topic/wip</code> branch off of the |
| current <code>HEAD</code>.</p> |
| </li> |
| <li> |
| <p>Rewind the master branch to get rid of those three commits.</p> |
| </li> |
| <li> |
| <p>Switch to <code>topic/wip</code> branch and keep working.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Undo commits permanently</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git commit ... |
| $ git reset --hard HEAD~3 <b class="conum">(1)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>The last three commits (<code>HEAD</code>, <code>HEAD^</code>, and <code>HEAD~2</code>) were bad |
| and you do not want to ever see them again. Do <strong>not</strong> do this if |
| you have already given these commits to somebody else. (See the |
| "RECOVERING FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a> |
| for the implications of doing so.)</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Undo a merge or pull</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git pull <b class="conum">(1)</b> |
| Auto-merging nitfol |
| CONFLICT (content): Merge conflict in nitfol |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git reset --hard <b class="conum">(2)</b> |
| $ git pull . topic/branch <b class="conum">(3)</b> |
| Updating from 41223... to 13134... |
| Fast-forward |
| $ git reset --hard ORIG_HEAD <b class="conum">(4)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>Try to update from the upstream resulted in a lot of |
| conflicts; you were not ready to spend a lot of time merging |
| right now, so you decide to do that later.</p> |
| </li> |
| <li> |
| <p>"pull" has not made merge commit, so <code>git</code> <code>reset</code> <code>--hard</code> |
| which is a synonym for <code>git</code> <code>reset</code> <code>--hard</code> <code>HEAD</code> clears the mess |
| from the index file and the working tree.</p> |
| </li> |
| <li> |
| <p>Merge a topic branch into the current branch, which resulted |
| in a fast-forward.</p> |
| </li> |
| <li> |
| <p>But you decided that the topic branch is not ready for public |
| consumption yet. "pull" or "merge" always leaves the original |
| tip of the current branch in <code>ORIG_HEAD</code>, so resetting hard to it |
| brings your index file and the working tree back to that state, |
| and resets the tip of the branch to that commit.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Undo a merge or pull inside a dirty working tree</dt> |
| <dd> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git pull <b class="conum">(1)</b> |
| Auto-merging nitfol |
| Merge made by recursive. |
| nitfol | 20 +++++---- |
| ... |
| $ git reset --merge ORIG_HEAD <b class="conum">(2)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>Even if you may have local modifications in your |
| working tree, you can safely say <code>git</code> <code>pull</code> when you know |
| that the change in the other branch does not overlap with |
| them.</p> |
| </li> |
| <li> |
| <p>After inspecting the result of the merge, you may find |
| that the change in the other branch is unsatisfactory. Running |
| <code>git</code> <code>reset</code> <code>--hard</code> <code>ORIG_HEAD</code> will let you go back to where you |
| were, but it will discard your local changes, which you do not |
| want. <code>git</code> <code>reset</code> <code>--merge</code> keeps your local changes.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Interrupted workflow</dt> |
| <dd> |
| <div class="paragraph"> |
| <p>Suppose you are interrupted by an urgent fix request while you |
| are in the middle of a large change. The files in your |
| working tree are not in any shape to be committed yet, but you |
| need to get to the other branch for a quick bugfix.</p> |
| </div> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git switch feature ;# you were working in "feature" branch and |
| $ work work work ;# got interrupted |
| $ git commit -a -m "snapshot WIP" <b class="conum">(1)</b> |
| $ git switch master |
| $ fix fix fix |
| $ git commit ;# commit with real log |
| $ git switch feature |
| $ git reset --soft HEAD^ ;# go back to WIP state <b class="conum">(2)</b> |
| $ git reset <b class="conum">(3)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>This commit will get blown away so a throw-away log message is OK.</p> |
| </li> |
| <li> |
| <p>This removes the <em>WIP</em> commit from the commit history, and sets |
| your working tree to the state just before you made that snapshot.</p> |
| </li> |
| <li> |
| <p>At this point the index file still has all the WIP changes you |
| committed as <em>snapshot WIP</em>. This updates the index to show your |
| WIP files as uncommitted.</p> |
| <div class="paragraph"> |
| <p>See also <a href="git-stash.html">git-stash(1)</a>.</p> |
| </div> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Reset a single file in the index</dt> |
| <dd> |
| <div class="paragraph"> |
| <p>Suppose you have added a file to your index, but later decide you do not |
| want to add it to your commit. You can remove the file from the index |
| while keeping your changes with git reset.</p> |
| </div> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git reset -- frotz.c <b class="conum">(1)</b> |
| $ git commit -m "Commit files in index" <b class="conum">(2)</b> |
| $ git add frotz.c <b class="conum">(3)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>This removes the file from the index while keeping it in the working |
| directory.</p> |
| </li> |
| <li> |
| <p>This commits all other changes in the index.</p> |
| </li> |
| <li> |
| <p>Adds the file to the index again.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Keep changes in working tree while discarding some previous commits</dt> |
| <dd> |
| <div class="paragraph"> |
| <p>Suppose you are working on something and you commit it, and then you |
| continue working a bit more, but now you think that what you have in |
| your working tree should be in another branch that has nothing to do |
| with what you committed previously. You can start a new branch and |
| reset it while keeping the changes in your working tree.</p> |
| </div> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git tag start |
| $ git switch -c branch1 |
| $ edit |
| $ git commit ... <b class="conum">(1)</b> |
| $ edit |
| $ git switch -c branch2 <b class="conum">(2)</b> |
| $ git reset --keep start <b class="conum">(3)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>This commits your first edits in <code>branch1</code>.</p> |
| </li> |
| <li> |
| <p>In the ideal world, you could have realized that the earlier |
| commit did not belong to the new topic when you created and switched |
| to <code>branch2</code> (i.e. <code>git</code> <code>switch</code> <code>-c</code> <code>branch2</code> <code>start</code>), but nobody is |
| perfect.</p> |
| </li> |
| <li> |
| <p>But you can use <code>reset</code> <code>--keep</code> to remove the unwanted commit after |
| you switched to <code>branch2</code>.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| <dt class="hdlist1">Split a commit apart into a sequence of commits</dt> |
| <dd> |
| <div class="paragraph"> |
| <p>Suppose that you have created lots of logically separate changes and committed |
| them together. Then, later you decide that it might be better to have each |
| logical chunk associated with its own commit. You can use git reset to rewind |
| history without changing the contents of your local files, and then successively |
| use <code>git</code> <code>add</code> <code>-p</code> to interactively select which hunks to include into each commit, |
| using <code>git</code> <code>commit</code> <code>-c</code> to pre-populate the commit message.</p> |
| </div> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>$ git reset -N HEAD^ <b class="conum">(1)</b> |
| $ git add -p <b class="conum">(2)</b> |
| $ git diff --cached <b class="conum">(3)</b> |
| $ git commit -c HEAD@{1} <b class="conum">(4)</b> |
| ... <b class="conum">(5)</b> |
| $ git add ... <b class="conum">(6)</b> |
| $ git diff --cached <b class="conum">(7)</b> |
| $ git commit ... <b class="conum">(8)</b></pre> |
| </div> |
| </div> |
| <div class="colist arabic"> |
| <ol> |
| <li> |
| <p>First, reset the history back one commit so that we remove the original |
| commit, but leave the working tree with all the changes. The <code>-N</code> ensures |
| that any new files added with <code>HEAD</code> are still marked so that <code>git</code> <code>add</code> <code>-p</code> |
| will find them.</p> |
| </li> |
| <li> |
| <p>Next, we interactively select diff hunks to add using the <code>git</code> <code>add</code> <code>-p</code> |
| facility. This will ask you about each diff hunk in sequence and you can |
| use simple commands such as "yes, include this", "No don’t include this" |
| or even the very powerful "edit" facility.</p> |
| </li> |
| <li> |
| <p>Once satisfied with the hunks you want to include, you should verify what |
| has been prepared for the first commit by using <code>git</code> <code>diff</code> <code>--cached</code>. This |
| shows all the changes that have been moved into the index and are about |
| to be committed.</p> |
| </li> |
| <li> |
| <p>Next, commit the changes stored in the index. The <code>-c</code> option specifies to |
| pre-populate the commit message from the original message that you started |
| with in the first commit. This is helpful to avoid retyping it. The |
| <code>HEAD@</code>{1} is a special notation for the commit that <code>HEAD</code> used to be at |
| prior to the original reset commit (1 change ago). |
| See <a href="git-reflog.html">git-reflog(1)</a> for more details. You may also use any other |
| valid commit reference.</p> |
| </li> |
| <li> |
| <p>You can repeat steps 2-4 multiple times to break the original code into |
| any number of commits.</p> |
| </li> |
| <li> |
| <p>Now you’ve split out many of the changes into their own commits, and might |
| no longer use the patch mode of <code>git</code> <code>add</code>, in order to select all remaining |
| uncommitted changes.</p> |
| </li> |
| <li> |
| <p>Once again, check to verify that you’ve included what you want to. You may |
| also wish to verify that git diff doesn’t show any remaining changes to be |
| committed later.</p> |
| </li> |
| <li> |
| <p>And finally create the final commit.</p> |
| </li> |
| </ol> |
| </div> |
| </dd> |
| </dl> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_discussion">DISCUSSION</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>The tables below show what happens when running:</p> |
| </div> |
| <div class="listingblock"> |
| <div class="content"> |
| <pre>git reset --option target</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>to reset the <code>HEAD</code> to another commit (<code>target</code>) with the different |
| reset options depending on the state of the files.</p> |
| </div> |
| <div class="paragraph"> |
| <p>In these tables, <code>A</code>, <code>B</code>, <code>C</code> and <code>D</code> are some different states of a |
| file. For example, the first line of the first table means that if a |
| file is in state <code>A</code> in the working tree, in state <code>B</code> in the index, in |
| state <code>C</code> in <code>HEAD</code> and in state <code>D</code> in the target, then <code>git</code> <code>reset</code> <code>--soft</code> |
| <code>target</code> will leave the file in the working tree in state <code>A</code> and in the |
| index in state <code>B</code>. It resets (i.e. moves) the <code>HEAD</code> (i.e. the tip of |
| the current branch, if you are on one) to <code>target</code> (which has the file |
| in state <code>D</code>).</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| A B C D --soft A B D |
| --mixed A D D |
| --hard D D D |
| --merge (disallowed) |
| --keep (disallowed)</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| A B C C --soft A B C |
| --mixed A C C |
| --hard C C C |
| --merge (disallowed) |
| --keep A C C</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| B B C D --soft B B D |
| --mixed B D D |
| --hard D D D |
| --merge D D D |
| --keep (disallowed)</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| B B C C --soft B B C |
| --mixed B C C |
| --hard C C C |
| --merge C C C |
| --keep B C C</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| B C C D --soft B C D |
| --mixed B D D |
| --hard D D D |
| --merge (disallowed) |
| --keep (disallowed)</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| B C C C --soft B C C |
| --mixed B C C |
| --hard C C C |
| --merge B C C |
| --keep B C C</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p><code>git</code> <code>reset</code> <code>--merge</code> is meant to be used when resetting out of a conflicted |
| merge. Any mergy operation guarantees that the working tree file that is |
| involved in the merge does not have a local change with respect to the index |
| before it starts, and that it writes the result out to the working tree. So if |
| we see some difference between the index and the target and also |
| between the index and the working tree, then it means that we are not |
| resetting out from a state that a mergy operation left after failing |
| with a conflict. That is why we disallow <code>--merge</code> option in this case.</p> |
| </div> |
| <div class="paragraph"> |
| <p><code>git</code> <code>reset</code> <code>--keep</code> is meant to be used when removing some of the last |
| commits in the current branch while keeping changes in the working |
| tree. If there could be conflicts between the changes in the commit we |
| want to remove and the changes in the working tree we want to keep, |
| the reset is disallowed. That’s why it is disallowed if there are both |
| changes between the working tree and <code>HEAD</code>, and between <code>HEAD</code> and the |
| target. To be safe, it is also disallowed when there are unmerged |
| entries.</p> |
| </div> |
| <div class="paragraph"> |
| <p>The following tables show what happens when there are unmerged |
| entries:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| X U A B --soft (disallowed) |
| --mixed X B B |
| --hard B B B |
| --merge B B B |
| --keep (disallowed)</pre> |
| </div> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>working index HEAD target working index HEAD |
| ---------------------------------------------------- |
| X U A A --soft (disallowed) |
| --mixed X A A |
| --hard A A A |
| --merge A A A |
| --keep (disallowed)</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p><code>X</code> means any state and <code>U</code> means an unmerged index.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_git">GIT</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>Part of the <a href="git.html">git(1)</a> suite</p> |
| </div> |
| </div> |
| </div> |
| </div> |
| <div id="footer"> |
| <div id="footer-text"> |
| Last updated 2025-04-23 15:22:37 -0700 |
| </div> |
| </div> |
| </body> |
| </html> |
