Google Git
Sign in
chromium / external / gitster / git-htmldocs / b358e217ee50e22d66a3a5ababe7e84c41d553c4 / . / git-stash.html
blob: b5ca451a369c9ac73de8228e0f6715aabe2da9b3 [file] [log] [blame]
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1<!DOCTYPE html>
2<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
3<head>
4<meta charset="UTF-8"/>
5<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
6<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame]7<meta name="generator" content="Asciidoctor 2.0.23"/>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]8<title>git-stash(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"; */
14html{font-family:sans-serif;-webkit-text-size-adjust:100%}
15a{background:none}
16a:focus{outline:thin dotted}
17a:active,a:hover{outline:0}
18h1{font-size:2em;margin:.67em 0}
19b,strong{font-weight:bold}
20abbr{font-size:.9em}
21abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
22dfn{font-style:italic}
23hr{height:0}
24mark{background:#ff0;color:#000}
25code,kbd,pre,samp{font-family:monospace;font-size:1em}
26pre{white-space:pre-wrap}
27q{quotes:"\201C" "\201D" "\2018" "\2019"}
28small{font-size:80%}
29sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
30sup{top:-.5em}
31sub{bottom:-.25em}
32img{border:0}
33svg:not(:root){overflow:hidden}
34figure{margin:0}
35audio,video{display:inline-block}
36audio:not([controls]){display:none;height:0}
37fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
38legend{border:0;padding:0}
39button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
40button,input{line-height:normal}
41button,select{text-transform:none}
42button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
43button[disabled],html input[disabled]{cursor:default}
44input[type=checkbox],input[type=radio]{padding:0}
45button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
46textarea{overflow:auto;vertical-align:top}
47table{border-collapse:collapse;border-spacing:0}
48*,::before,::after{box-sizing:border-box}
49html,body{font-size:100%}
50body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
51a:hover{cursor:pointer}
52img,object,embed{max-width:100%;height:auto}
53object,embed{height:100%}
54img{-ms-interpolation-mode:bicubic}
55.left{float:left!important}
56.right{float:right!important}
57.text-left{text-align:left!important}
58.text-right{text-align:right!important}
59.text-center{text-align:center!important}
60.text-justify{text-align:justify!important}
61.hide{display:none}
62img,object,svg{display:inline-block;vertical-align:middle}
63textarea{height:auto;min-height:50px}
64select{width:100%}
65.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
66div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
67a{color:#2156a5;text-decoration:underline;line-height:inherit}
68a:hover,a:focus{color:#1d4b8f}
69a img{border:0}
70p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
71p aside{font-size:.875em;line-height:1.35;font-style:italic}
72h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
73h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
74h1{font-size:2.125em}
75h2{font-size:1.6875em}
76h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
77h4,h5{font-size:1.125em}
78h6{font-size:1em}
79hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
80em,i{font-style:italic;line-height:inherit}
81strong,b{font-weight:bold;line-height:inherit}
82small{font-size:60%;line-height:inherit}
83code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
84ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
85ul,ol{margin-left:1.5em}
86ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
87ul.circle{list-style-type:circle}
88ul.disc{list-style-type:disc}
89ul.square{list-style-type:square}
90ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
91ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
92dl dt{margin-bottom:.3125em;font-weight:bold}
93dl dd{margin-bottom:1.25em}
94blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
95blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
96@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
97h1{font-size:2.75em}
98h2{font-size:2.3125em}
99h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
100h4{font-size:1.4375em}}
101table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
102table thead,table tfoot{background:#f7f8f7}
103table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
104table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
105table tr.even,table tr.alt{background:#f8f8f7}
106table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
107h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
108h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
109.center{margin-left:auto;margin-right:auto}
110.stretch{width:100%}
111.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
112.clearfix::after,.float-group::after{clear:both}
113:not(pre).nobreak{word-wrap:normal}
114:not(pre).nowrap{white-space:nowrap}
115:not(pre).pre-wrap{white-space:pre-wrap}
116:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
117pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
118pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
119pre>code{display:block}
120pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
121em em{font-style:normal}
122strong strong{font-weight:400}
123.keyseq{color:rgba(51,51,51,.8)}
124kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
125.keyseq kbd:first-child{margin-left:0}
126.keyseq kbd:last-child{margin-right:0}
127.menuseq,.menuref{color:#000}
128.menuseq b:not(.caret),.menuref{font-weight:inherit}
129.menuseq{word-spacing:-.02em}
130.menuseq b.caret{font-size:1.25em;line-height:.8}
131.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
132b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
133b.button::before{content:"[";padding:0 3px 0 2px}
134b.button::after{content:"]";padding:0 2px 0 3px}
135p a>code:hover{color:rgba(0,0,0,.9)}
136#header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
137#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
138#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
139#content{margin-top:1.25em}
140#content::before{content:none}
141#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
142#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame]143#header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]144#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap}
145#header .details span:first-child{margin-left:-.125em}
146#header .details span.email a{color:rgba(0,0,0,.85)}
147#header .details br{display:none}
148#header .details br+span::before{content:"\00a0\2013\00a0"}
149#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
150#header .details br+span#revremark::before{content:"\00a0|\00a0"}
151#header #revnumber{text-transform:capitalize}
152#header #revnumber::after{content:"\00a0"}
153#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
154#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
155#toc>ul{margin-left:.125em}
156#toc ul.sectlevel0>li>a{font-style:italic}
157#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
158#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
159#toc li{line-height:1.3334;margin-top:.3334em}
160#toc a{text-decoration:none}
161#toc a:active{text-decoration:underline}
162#toctitle{color:#7a2518;font-size:1.2em}
163@media screen and (min-width:768px){#toctitle{font-size:1.375em}
164body.toc2{padding-left:15em;padding-right:0}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame]165body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]166#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
167#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
168#toc.toc2>ul{font-size:.9em;margin-bottom:0}
169#toc.toc2 ul ul{margin-left:0;padding-left:1em}
170#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
171body.toc2.toc-right{padding-left:0;padding-right:15em}
172body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
173@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
174#toc.toc2{width:20em}
175#toc.toc2 #toctitle{font-size:1.375em}
176#toc.toc2>ul{font-size:.95em}
177#toc.toc2 ul ul{padding-left:1.25em}
178body.toc2.toc-right{padding-left:0;padding-right:20em}}
179#content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
180#content #toc>:first-child{margin-top:0}
181#content #toc>:last-child{margin-bottom:0}
182#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
183#footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
184#content{margin-bottom:.625em}
185.sect1{padding-bottom:.625em}
186@media screen and (min-width:768px){#content{margin-bottom:1.25em}
187.sect1{padding-bottom:1.25em}}
188.sect1:last-child{padding-bottom:0}
189.sect1+.sect1{border-top:1px solid #e7e7e9}
190#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
191#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
192#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
193#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
194#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
195details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
196details{margin-left:1.25rem}
197details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
198details>summary::-webkit-details-marker{display:none}
199details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)}
200details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
201details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
202.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
203table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
204.paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
205.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
206.admonitionblock>table td.icon{text-align:center;width:80px}
207.admonitionblock>table td.icon img{max-width:none}
208.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
209.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
210.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
211.exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
212.sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
213.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
214.exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
215.exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
216.literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
217@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
218@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
219.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
220.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
221.listingblock>.content{position:relative}
222.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
223.listingblock:hover code[data-lang]::before{display:block}
224.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
225.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
226.listingblock pre.highlightjs{padding:0}
227.listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
228.listingblock pre.prettyprint{border-width:0}
229.prettyprint{background:#f7f7f8}
230pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
231pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
232pre.prettyprint li code[data-lang]::before{opacity:1}
233pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
234table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
235table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
236table.linenotable td.code{padding-left:.75em}
237table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
238pre.pygments span.linenos{display:inline-block;margin-right:.75em}
239.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
240.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
241.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
242.quoteblock blockquote{margin:0;padding:0;border:0}
243.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
244.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
245.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
246.verseblock{margin:0 1em 1.25em}
247.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
248.verseblock pre strong{font-weight:400}
249.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
250.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
251.quoteblock .attribution br,.verseblock .attribution br{display:none}
252.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
253.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
254.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
255.quoteblock.abstract{margin:0 1em 1.25em;display:block}
256.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
257.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
258.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
259.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
260.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
261p.tableblock:last-child{margin-bottom:0}
262td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
263td.tableblock>.content>:last-child{margin-bottom:-1.25em}
264table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
265table.grid-all>*>tr>*{border-width:1px}
266table.grid-cols>*>tr>*{border-width:0 1px}
267table.grid-rows>*>tr>*{border-width:1px 0}
268table.frame-all{border-width:1px}
269table.frame-ends{border-width:1px 0}
270table.frame-sides{border-width:0 1px}
271table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
272table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
273table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
274table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
275table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7}
276th.halign-left,td.halign-left{text-align:left}
277th.halign-right,td.halign-right{text-align:right}
278th.halign-center,td.halign-center{text-align:center}
279th.valign-top,td.valign-top{vertical-align:top}
280th.valign-bottom,td.valign-bottom{vertical-align:bottom}
281th.valign-middle,td.valign-middle{vertical-align:middle}
282table thead th,table tfoot th{font-weight:bold}
283tbody tr th{background:#f7f8f7}
284tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
285p.tableblock>code:only-child{background:none;padding:0}
286p.tableblock{font-size:1em}
287ol{margin-left:1.75em}
288ul li ol{margin-left:1.5em}
289dl dd{margin-left:1.125em}
290dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
291li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
292ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
293ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
294ul.unstyled,ol.unstyled{margin-left:0}
295li>p:empty:only-child::before{content:"";display:inline-block}
296ul.checklist>li>p:first-child{margin-left:-1em}
297ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
298ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
299ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
300ul.inline>li{margin-left:1.25em}
301.unstyled dl dt{font-weight:400;font-style:normal}
302ol.arabic{list-style-type:decimal}
303ol.decimal{list-style-type:decimal-leading-zero}
304ol.loweralpha{list-style-type:lower-alpha}
305ol.upperalpha{list-style-type:upper-alpha}
306ol.lowerroman{list-style-type:lower-roman}
307ol.upperroman{list-style-type:upper-roman}
308ol.lowergreek{list-style-type:lower-greek}
309.hdlist>table,.colist>table{border:0;background:none}
310.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
311td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
312td.hdlist1{font-weight:bold;padding-bottom:1.25em}
313td.hdlist2{word-wrap:anywhere}
314.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
315.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
316.colist td:not([class]):first-child img{max-width:none}
317.colist td:not([class]):last-child{padding:.25em 0}
318.thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
319.imageblock.left{margin:.25em .625em 1.25em 0}
320.imageblock.right{margin:.25em 0 1.25em .625em}
321.imageblock>.title{margin-bottom:0}
322.imageblock.thumb,.imageblock.th{border-width:6px}
323.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
324.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
325.image.left{margin-right:.625em}
326.image.right{margin-left:.625em}
327a.image{text-decoration:none;display:inline-block}
328a.image object{pointer-events:none}
329sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
330sup.footnote a,sup.footnoteref a{text-decoration:none}
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame]331sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]332#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
333#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
334#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
335#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
336#footnotes .footnote:last-of-type{margin-bottom:0}
337#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
338div.unbreakable{page-break-inside:avoid}
339.big{font-size:larger}
340.small{font-size:smaller}
341.underline{text-decoration:underline}
342.overline{text-decoration:overline}
343.line-through{text-decoration:line-through}
344.aqua{color:#00bfbf}
345.aqua-background{background:#00fafa}
346.black{color:#000}
347.black-background{background:#000}
348.blue{color:#0000bf}
349.blue-background{background:#0000fa}
350.fuchsia{color:#bf00bf}
351.fuchsia-background{background:#fa00fa}
352.gray{color:#606060}
353.gray-background{background:#7d7d7d}
354.green{color:#006000}
355.green-background{background:#007d00}
356.lime{color:#00bf00}
357.lime-background{background:#00fa00}
358.maroon{color:#600000}
359.maroon-background{background:#7d0000}
360.navy{color:#000060}
361.navy-background{background:#00007d}
362.olive{color:#606000}
363.olive-background{background:#7d7d00}
364.purple{color:#600060}
365.purple-background{background:#7d007d}
366.red{color:#bf0000}
367.red-background{background:#fa0000}
368.silver{color:#909090}
369.silver-background{background:#bcbcbc}
370.teal{color:#006060}
371.teal-background{background:#007d7d}
372.white{color:#bfbfbf}
373.white-background{background:#fafafa}
374.yellow{color:#bfbf00}
375.yellow-background{background:#fafa00}
376span.icon>.fa{cursor:default}
377a span.icon>.fa{cursor:inherit}
378.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
379.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
380.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
381.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
382.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
383.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
384.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
385.conum[data-value] *{color:#fff!important}
386.conum[data-value]+b{display:none}
387.conum[data-value]::after{content:attr(data-value)}
388pre .conum[data-value]{position:relative;top:-.125em}
389b.conum *{color:inherit!important}
390.conum:not([data-value]):empty{display:none}
391dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
392h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
393p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
394p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
395p{margin-bottom:1.25rem}
396.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
397.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
398.print-only{display:none!important}
399@page{margin:1.25cm .75cm}
400@media print{*{box-shadow:none!important;text-shadow:none!important}
401html{font-size:80%}
402a{color:inherit!important;text-decoration:underline!important}
403a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
404a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
405abbr[title]{border-bottom:1px dotted}
406abbr[title]::after{content:" (" attr(title) ")"}
407pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
408thead{display:table-header-group}
409svg{max-width:100%}
410p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
411h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
412#header,#content,#footnotes,#footer{max-width:none}
413#toc,.sidebarblock,.exampleblock>.content{background:none!important}
414#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
415body.book #header{text-align:center}
416body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
417body.book #header .details{border:0!important;display:block;padding:0!important}
418body.book #header .details span:first-child{margin-left:0!important}
419body.book #header .details br{display:block}
420body.book #header .details br+span::before{content:none!important}
421body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
422body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
423.listingblock code[data-lang]::before{display:block}
424#footer{padding:0 .9375em}
425.hide-on-print{display:none!important}
426.print-only{display:block!important}
427.hide-for-print{display:none!important}
428.show-for-print{display:inherit!important}}
429@media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
430.sect1{padding:0!important}
431.sect1+.sect1{border:0}
432#footer{background:none}
433#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
434@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
435</style>
436<style>
437pre>code {
438 display: inline;
439}
440</style>
441</head>
442<body class="manpage">
443<div id="header">
444<h1>git-stash(1) Manual Page</h1>
445<h2 id="_name">NAME</h2>
446<div class="sectionbody">
447<p>git-stash - Stash the changes in a dirty working directory away</p>
448</div>
449</div>
450<div id="content">
451<div class="sect1">
452<h2 id="_synopsis">SYNOPSIS</h2>
453<div class="sectionbody">
454<div class="verseblock">
455<pre class="content"><em>git stash</em> list [&lt;log-options&gt;]
456<em>git stash</em> show [-u | --include-untracked | --only-untracked] [&lt;diff-options&gt;] [&lt;stash&gt;]
457<em>git stash</em> drop [-q | --quiet] [&lt;stash&gt;]
458<em>git stash</em> pop [--index] [-q | --quiet] [&lt;stash&gt;]
459<em>git stash</em> apply [--index] [-q | --quiet] [&lt;stash&gt;]
460<em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]
461<em>git stash</em> [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
462 [-u | --include-untracked] [-a | --all] [(-m | --message) &lt;message&gt;]
463 [--pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]]
464 [--] [&lt;pathspec&gt;&#8230;&#8203;]]
465<em>git stash</em> save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
466 [-u | --include-untracked] [-a | --all] [&lt;message&gt;]
467<em>git stash</em> clear
468<em>git stash</em> create [&lt;message&gt;]
469<em>git stash</em> store [(-m | --message) &lt;message&gt;] [-q | --quiet] &lt;commit&gt;</pre>
470</div>
471</div>
472</div>
473<div class="sect1">
474<h2 id="_description">DESCRIPTION</h2>
475<div class="sectionbody">
476<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]477<p>Use <code>git</code> <code>stash</code> when you want to record the current state of the
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]478working directory and the index, but want to go back to a clean
479working directory. The command saves your local modifications away
480and reverts the working directory to match the <code>HEAD</code> commit.</p>
481</div>
482<div class="paragraph">
483<p>The modifications stashed away by this command can be listed with
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]484<code>git</code> <code>stash</code> <code>list</code>, inspected with <code>git</code> <code>stash</code> <code>show</code>, and restored
485(potentially on top of a different commit) with <code>git</code> <code>stash</code> <code>apply</code>.
486Calling <code>git</code> <code>stash</code> without any arguments is equivalent to <code>git</code> <code>stash</code> <code>push</code>.
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]487A stash is by default listed as "WIP on <em>branchname</em> &#8230;&#8203;", but
488you can give a more descriptive message on the command line when
489you create one.</p>
490</div>
491<div class="paragraph">
492<p>The latest stash you created is stored in <code>refs/stash</code>; older
493stashes are found in the reflog of this reference and can be named using
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]494the usual reflog syntax (e.g. <code>stash@</code>{0} is the most recently
495created stash, <code>stash@</code>{1} is the one before it, <code>stash@</code>{2.<code>hours.ago</code>}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]496is also possible). Stashes may also be referenced by specifying just the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]497stash index (e.g. the integer <code>n</code> is equivalent to <code>stash@</code>{n}).</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]498</div>
499</div>
500</div>
501<div class="sect1">
502<h2 id="_commands">COMMANDS</h2>
503<div class="sectionbody">
504<div class="dlist">
505<dl>
506<dt class="hdlist1">push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [(-m|--message) &lt;message&gt;] [--pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]] [--] [&lt;pathspec&gt;&#8230;&#8203;]</dt>
507<dd>
508<p>Save your local modifications to a new <em>stash entry</em> and roll them
509back to HEAD (in the working tree and in the index).
510The &lt;message&gt; part is optional and gives
511the description along with the stashed state.</p>
512<div class="paragraph">
513<p>For quickly making a snapshot, you can omit "push". In this mode,
514non-option arguments are not allowed to prevent a misspelled
515subcommand from making an unwanted stash entry. The two exceptions to this
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]516are <code>stash</code> <code>-p</code> which acts as alias for <code>stash</code> <code>push</code> <code>-p</code> and pathspec elements,
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]517which are allowed after a double hyphen <code>--</code> for disambiguation.</p>
518</div>
519</dd>
520<dt class="hdlist1">save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]</dt>
521<dd>
522<p>This option is deprecated in favour of <em>git stash push</em>. It
523differs from "stash push" in that it cannot take pathspec.
524Instead, all non-option arguments are concatenated to form the stash
525message.</p>
526</dd>
527<dt class="hdlist1">list [&lt;log-options&gt;]</dt>
528<dd>
529<p>List the stash entries that you currently have. Each <em>stash entry</em> is
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]530listed with its name (e.g. <code>stash@</code>{0} is the latest entry, <code>stash@</code>{1} is
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]531the one before, etc.), the name of the branch that was current when the
532entry was made, and a short description of the commit the entry was
533based on.</p>
534<div class="listingblock">
535<div class="content">
536<pre>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
537stash@{1}: On master: 9cc0589... Add git-stash</pre>
538</div>
539</div>
540<div class="paragraph">
541<p>The command takes options applicable to the <em>git log</em>
542command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p>
543</div>
544</dd>
545<dt class="hdlist1">show [-u|--include-untracked|--only-untracked] [&lt;diff-options&gt;] [&lt;stash&gt;]</dt>
546<dd>
547<p>Show the changes recorded in the stash entry as a diff between the
548stashed contents and the commit back when the stash entry was first
549created.
550By default, the command shows the diffstat, but it will accept any
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]551format known to <em>git diff</em> (e.g., <code>git</code> <code>stash</code> <code>show</code> <code>-p</code> <code>stash@</code>{1}
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]552to view the second most recent entry in patch form).
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]553If no <em>&lt;diff-option&gt;</em> is provided, the default behavior will be given
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]554by the <code>stash.showStat</code>, and <code>stash.showPatch</code> config variables. You
555can also use <code>stash.showIncludeUntracked</code> to set whether
556<code>--include-untracked</code> is enabled by default.</p>
557</dd>
558<dt class="hdlist1">pop [--index] [-q|--quiet] [&lt;stash&gt;]</dt>
559<dd>
560<p>Remove a single stashed state from the stash list and apply it
561on top of the current working tree state, i.e., do the inverse
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]562operation of <code>git</code> <code>stash</code> <code>push</code>. The working directory must
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]563match the index.</p>
564<div class="paragraph">
565<p>Applying the state can fail with conflicts; in this case, it is not
566removed from the stash list. You need to resolve the conflicts by hand
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]567and call <code>git</code> <code>stash</code> <code>drop</code> manually afterwards.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]568</div>
569</dd>
570<dt class="hdlist1">apply [--index] [-q|--quiet] [&lt;stash&gt;]</dt>
571<dd>
572<p>Like <code>pop</code>, but do not remove the state from the stash list. Unlike <code>pop</code>,
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]573<em>&lt;stash&gt;</em> may be any commit that looks like a commit created by
574<code>stash</code> <code>push</code> or <code>stash</code> <code>create</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]575</dd>
576<dt class="hdlist1">branch &lt;branchname&gt; [&lt;stash&gt;]</dt>
577<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]578<p>Creates and checks out a new branch named <em>&lt;branchname&gt;</em> starting from
579the commit at which the <em>&lt;stash&gt;</em> was originally created, applies the
580changes recorded in <em>&lt;stash&gt;</em> to the new working tree and index.
581If that succeeds, and <em>&lt;stash&gt;</em> is a reference of the form
582<code>stash@</code>{<em>&lt;revision&gt;</em>}, it then drops the <em>&lt;stash&gt;</em>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]583<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]584<p>This is useful if the branch on which you ran <code>git</code> <code>stash</code> <code>push</code> has
585changed enough that <code>git</code> <code>stash</code> <code>apply</code> fails due to conflicts. Since
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]586the stash entry is applied on top of the commit that was HEAD at the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]587time <code>git</code> <code>stash</code> was run, it restores the originally stashed state
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]588with no conflicts.</p>
589</div>
590</dd>
591<dt class="hdlist1">clear</dt>
592<dd>
593<p>Remove all the stash entries. Note that those entries will then
594be subject to pruning, and may be impossible to recover (see
595<em>Examples</em> below for a possible strategy).</p>
596</dd>
597<dt class="hdlist1">drop [-q|--quiet] [&lt;stash&gt;]</dt>
598<dd>
599<p>Remove a single stash entry from the list of stash entries.</p>
600</dd>
601<dt class="hdlist1">create</dt>
602<dd>
603<p>Create a stash entry (which is a regular commit object) and
604return its object name, without storing it anywhere in the ref
605namespace.
606This is intended to be useful for scripts. It is probably not
607the command you want to use; see "push" above.</p>
608</dd>
609<dt class="hdlist1">store</dt>
610<dd>
611<p>Store a given stash created via <em>git stash create</em> (which is a
612dangling merge commit) in the stash ref, updating the stash
613reflog. This is intended to be useful for scripts. It is
614probably not the command you want to use; see "push" above.</p>
615</dd>
616</dl>
617</div>
618</div>
619</div>
620<div class="sect1">
621<h2 id="_options">OPTIONS</h2>
622<div class="sectionbody">
623<div class="dlist">
624<dl>
625<dt class="hdlist1">-a</dt>
626<dt class="hdlist1">--all</dt>
627<dd>
628<p>This option is only valid for <code>push</code> and <code>save</code> commands.</p>
629<div class="paragraph">
630<p>All ignored and untracked files are also stashed and then cleaned
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]631up with <code>git</code> <code>clean</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]632</div>
633</dd>
634<dt class="hdlist1">-u</dt>
635<dt class="hdlist1">--include-untracked</dt>
636<dt class="hdlist1">--no-include-untracked</dt>
637<dd>
638<p>When used with the <code>push</code> and <code>save</code> commands,
639all untracked files are also stashed and then cleaned up with
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]640<code>git</code> <code>clean</code>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]641<div class="paragraph">
642<p>When used with the <code>show</code> command, show the untracked files in the stash
643entry as part of the diff.</p>
644</div>
645</dd>
646<dt class="hdlist1">--only-untracked</dt>
647<dd>
648<p>This option is only valid for the <code>show</code> command.</p>
649<div class="paragraph">
650<p>Show only the untracked files in the stash entry as part of the diff.</p>
651</div>
652</dd>
653<dt class="hdlist1">--index</dt>
654<dd>
655<p>This option is only valid for <code>pop</code> and <code>apply</code> commands.</p>
656<div class="paragraph">
657<p>Tries to reinstate not only the working tree&#8217;s changes, but also
658the index&#8217;s ones. However, this can fail, when you have conflicts
659(which are stored in the index, where you therefore can no longer
660apply the changes as they were originally).</p>
661</div>
662</dd>
663<dt class="hdlist1">-k</dt>
664<dt class="hdlist1">--keep-index</dt>
665<dt class="hdlist1">--no-keep-index</dt>
666<dd>
667<p>This option is only valid for <code>push</code> and <code>save</code> commands.</p>
668<div class="paragraph">
669<p>All changes already added to the index are left intact.</p>
670</div>
671</dd>
672<dt class="hdlist1">-p</dt>
673<dt class="hdlist1">--patch</dt>
674<dd>
675<p>This option is only valid for <code>push</code> and <code>save</code> commands.</p>
676<div class="paragraph">
677<p>Interactively select hunks from the diff between HEAD and the
678working tree to be stashed. The stash entry is constructed such
679that its index state is the same as the index state of your
680repository, and its worktree contains only the changes you selected
681interactively. The selected changes are then rolled back from your
682worktree. See the &#8220;Interactive Mode&#8221; section of <a href="git-add.html">git-add(1)</a>
683to learn how to operate the <code>--patch</code> mode.</p>
684</div>
685<div class="paragraph">
686<p>The <code>--patch</code> option implies <code>--keep-index</code>. You can use
687<code>--no-keep-index</code> to override this.</p>
688</div>
689</dd>
690<dt class="hdlist1">-S</dt>
691<dt class="hdlist1">--staged</dt>
692<dd>
693<p>This option is only valid for <code>push</code> and <code>save</code> commands.</p>
694<div class="paragraph">
695<p>Stash only the changes that are currently staged. This is similar to
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]696basic <code>git</code> <code>commit</code> except the state is committed to the stash instead
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]697of current branch.</p>
698</div>
699<div class="paragraph">
700<p>The <code>--patch</code> option has priority over this one.</p>
701</div>
702</dd>
703<dt class="hdlist1">--pathspec-from-file=&lt;file&gt;</dt>
704<dd>
705<p>This option is only valid for <code>push</code> command.</p>
706<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]707<p>Pathspec is passed in <em>&lt;file&gt;</em> instead of commandline args. If
708<em>&lt;file&gt;</em> is exactly <code>-</code> then standard input is used. Pathspec
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]709elements are separated by LF or CR/LF. Pathspec elements can be
710quoted as explained for the configuration variable <code>core.quotePath</code>
711(see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and
712global <code>--literal-pathspecs</code>.</p>
713</div>
714</dd>
715<dt class="hdlist1">--pathspec-file-nul</dt>
716<dd>
717<p>This option is only valid for <code>push</code> command.</p>
718<div class="paragraph">
719<p>Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are
720separated with NUL character and all other characters are taken
721literally (including newlines and quotes).</p>
722</div>
723</dd>
724<dt class="hdlist1">-q</dt>
725<dt class="hdlist1">--quiet</dt>
726<dd>
727<p>This option is only valid for <code>apply</code>, <code>drop</code>, <code>pop</code>, <code>push</code>,
728<code>save</code>, <code>store</code> commands.</p>
729<div class="paragraph">
730<p>Quiet, suppress feedback messages.</p>
731</div>
732</dd>
733<dt class="hdlist1">--</dt>
734<dd>
735<p>This option is only valid for <code>push</code> command.</p>
736<div class="paragraph">
737<p>Separates pathspec from options for disambiguation purposes.</p>
738</div>
739</dd>
740<dt class="hdlist1">&lt;pathspec&gt;&#8230;&#8203;</dt>
741<dd>
742<p>This option is only valid for <code>push</code> command.</p>
743<div class="paragraph">
744<p>The new stash entry records the modified states only for the files
745that match the pathspec. The index entries and working tree files
746are then rolled back to the state in HEAD only for these files,
747too, leaving files that do not match the pathspec intact.</p>
748</div>
749<div class="paragraph">
750<p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p>
751</div>
752</dd>
753<dt class="hdlist1">&lt;stash&gt;</dt>
754<dd>
755<p>This option is only valid for <code>apply</code>, <code>branch</code>, <code>drop</code>, <code>pop</code>,
756<code>show</code> commands.</p>
757<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]758<p>A reference of the form <code>stash@</code>{<em>&lt;revision&gt;</em>}. When no <em>&lt;stash&gt;</em> is
759given, the latest stash is assumed (that is, <code>stash@</code>{0}).</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]760</div>
761</dd>
762</dl>
763</div>
764</div>
765</div>
766<div class="sect1">
767<h2 id="_discussion">DISCUSSION</h2>
768<div class="sectionbody">
769<div class="paragraph">
770<p>A stash entry is represented as a commit whose tree records the state
771of the working directory, and its first parent is the commit at <code>HEAD</code>
772when the entry was created. The tree of the second parent records the
773state of the index when the entry is made, and it is made a child of
774the <code>HEAD</code> commit. The ancestry graph looks like this:</p>
775</div>
776<div class="literalblock">
777<div class="content">
778<pre> .----W
779 / /
780-----H----I</pre>
781</div>
782</div>
783<div class="paragraph">
784<p>where <code>H</code> is the <code>HEAD</code> commit, <code>I</code> is a commit that records the state
785of the index, and <code>W</code> is a commit that records the state of the working
786tree.</p>
787</div>
788</div>
789</div>
790<div class="sect1">
791<h2 id="_examples">EXAMPLES</h2>
792<div class="sectionbody">
793<div class="dlist">
794<dl>
795<dt class="hdlist1">Pulling into a dirty tree</dt>
796<dd>
797<p>When you are in the middle of something, you learn that there are
798upstream changes that are possibly relevant to what you are
799doing. When your local changes do not conflict with the changes in
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]800the upstream, a simple <code>git</code> <code>pull</code> will let you move forward.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]801<div class="paragraph">
802<p>However, there are cases in which your local changes do conflict with
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]803the upstream changes, and <code>git</code> <code>pull</code> refuses to overwrite your
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]804changes. In such a case, you can stash your changes away,
805perform a pull, and then unstash, like this:</p>
806</div>
807<div class="listingblock">
808<div class="content">
809<pre>$ git pull
810 ...
811file foobar not up to date, cannot merge.
812$ git stash
813$ git pull
814$ git stash pop</pre>
815</div>
816</div>
817</dd>
818<dt class="hdlist1">Interrupted workflow</dt>
819<dd>
820<p>When you are in the middle of something, your boss comes in and
821demands that you fix something immediately. Traditionally, you would
822make a commit to a temporary branch to store your changes away, and
823return to your original branch to make the emergency fix, like this:</p>
824<div class="listingblock">
825<div class="content">
826<pre># ... hack hack hack ...
827$ git switch -c my_wip
828$ git commit -a -m "WIP"
829$ git switch master
830$ edit emergency fix
831$ git commit -a -m "Fix in a hurry"
832$ git switch my_wip
833$ git reset --soft HEAD^
834# ... continue hacking ...</pre>
835</div>
836</div>
837<div class="paragraph">
838<p>You can use <em>git stash</em> to simplify the above, like this:</p>
839</div>
840<div class="listingblock">
841<div class="content">
842<pre># ... hack hack hack ...
843$ git stash
844$ edit emergency fix
845$ git commit -a -m "Fix in a hurry"
846$ git stash pop
847# ... continue hacking ...</pre>
848</div>
849</div>
850</dd>
851<dt class="hdlist1">Testing partial commits</dt>
852<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]853<p>You can use <code>git</code> <code>stash</code> <code>push</code> <code>--keep-index</code> when you want to make two or
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]854more commits out of the changes in the work tree, and you want to test
855each change before committing:</p>
856<div class="listingblock">
857<div class="content">
858<pre># ... hack hack hack ...
859$ git add --patch foo # add just first part to the index
860$ git stash push --keep-index # save all other changes to the stash
861$ edit/build/test first part
862$ git commit -m 'First part' # commit fully tested change
863$ git stash pop # prepare to work on all other changes
864# ... repeat above five steps until one commit remains ...
865$ edit/build/test remaining parts
866$ git commit foo -m 'Remaining parts'</pre>
867</div>
868</div>
869</dd>
870<dt class="hdlist1">Saving unrelated changes for future use</dt>
871<dd>
872<p>When you are in the middle of massive changes and you find some
873unrelated issue that you don&#8217;t want to forget to fix, you can do the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]874change(s), stage them, and use <code>git</code> <code>stash</code> <code>push</code> <code>--staged</code> to stash them
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]875out for future use. This is similar to committing the staged changes,
876only the commit ends-up being in the stash and not on the current branch.</p>
877<div class="listingblock">
878<div class="content">
879<pre># ... hack hack hack ...
880$ git add --patch foo # add unrelated changes to the index
881$ git stash push --staged # save these changes to the stash
882# ... hack hack hack, finish current changes ...
883$ git commit -m 'Massive' # commit fully tested changes
884$ git switch fixup-branch # switch to another branch
885$ git stash pop # to finish work on the saved changes</pre>
886</div>
887</div>
888</dd>
889<dt class="hdlist1">Recovering stash entries that were cleared/dropped erroneously</dt>
890<dd>
891<p>If you mistakenly drop or clear stash entries, they cannot be recovered
892through the normal safety mechanisms. However, you can try the
893following incantation to get a list of stash entries that are still in
894your repository, but not reachable any more:</p>
895<div class="listingblock">
896<div class="content">
897<pre>git fsck --unreachable |
898grep commit | cut -d\ -f3 |
899xargs git log --merges --no-walk --grep=WIP</pre>
900</div>
901</div>
902</dd>
903</dl>
904</div>
905</div>
906</div>
907<div class="sect1">
908<h2 id="_configuration">CONFIGURATION</h2>
909<div class="sectionbody">
910<div class="paragraph">
911<p>Everything below this line in this section is selectively included
912from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
913as what&#8217;s found there:</p>
914</div>
915<div class="dlist">
916<dl>
917<dt class="hdlist1">stash.showIncludeUntracked</dt>
918<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]919<p>If this is set to true, the <code>git</code> <code>stash</code> <code>show</code> command will show
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]920the untracked files of a stash entry. Defaults to false. See
921the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.</p>
922</dd>
923<dt class="hdlist1">stash.showPatch</dt>
924<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]925<p>If this is set to true, the <code>git</code> <code>stash</code> <code>show</code> command without an
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]926option will show the stash entry in patch form. Defaults to false.
927See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.</p>
928</dd>
929<dt class="hdlist1">stash.showStat</dt>
930<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]931<p>If this is set to true, the <code>git</code> <code>stash</code> <code>show</code> command without an
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]932option will show a diffstat of the stash entry. Defaults to true.
933See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.</p>
934</dd>
935</dl>
936</div>
937</div>
938</div>
939<div class="sect1">
940<h2 id="_see_also">SEE ALSO</h2>
941<div class="sectionbody">
942<div class="paragraph">
943<p><a href="git-checkout.html">git-checkout(1)</a>,
944<a href="git-commit.html">git-commit(1)</a>,
945<a href="git-reflog.html">git-reflog(1)</a>,
946<a href="git-reset.html">git-reset(1)</a>,
947<a href="git-switch.html">git-switch(1)</a></p>
948</div>
949</div>
950</div>
951<div class="sect1">
952<h2 id="_git">GIT</h2>
953<div class="sectionbody">
954<div class="paragraph">
955<p>Part of the <a href="git.html">git(1)</a> suite</p>
956</div>
957</div>
958</div>
959</div>
960<div id="footer">
961<div id="footer-text">
Junio C Hamanod6a33e42025-02-18 23:45:11[diff] [blame]962Last updated 2025-02-14 21:38:14 -0800
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]963</div>
964</div>
965</body>
966</html>