git-stash.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   2     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   4 <head>
   5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   6 <meta name="generator" content="AsciiDoc 8.2.5" />
   7 <style type="text/css">
   8 /* Debug borders */
   9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  10 /*
  11   border: 1px solid red;
  12 */
  13 }
  14
  15 body {
  16   margin: 1em 5% 1em 5%;
  17 }
  18
  19 a {
  20   color: blue;
  21   text-decoration: underline;
  22 }
  23 a:visited {
  24   color: fuchsia;
  25 }
  26
  27 em {
  28   font-style: italic;
  29 }
  30
  31 strong {
  32   font-weight: bold;
  33 }
  34
  35 tt {
  36   color: navy;
  37 }
  38
  39 h1, h2, h3, h4, h5, h6 {
  40   color: #527bbd;
  41   font-family: sans-serif;
  42   margin-top: 1.2em;
  43   margin-bottom: 0.5em;
  44   line-height: 1.3;
  45 }
  46
  47 h1, h2, h3 {
  48   border-bottom: 2px solid silver;
  49 }
  50 h2 {
  51   padding-top: 0.5em;
  52 }
  53 h3 {
  54   float: left;
  55 }
  56 h3 + * {
  57   clear: left;
  58 }
  59
  60 div.sectionbody {
  61   font-family: serif;
  62   margin-left: 0;
  63 }
  64
  65 hr {
  66   border: 1px solid silver;
  67 }
  68
  69 p {
  70   margin-top: 0.5em;
  71   margin-bottom: 0.5em;
  72 }
  73
  74 pre {
  75   padding: 0;
  76   margin: 0;
  77 }
  78
  79 span#author {
  80   color: #527bbd;
  81   font-family: sans-serif;
  82   font-weight: bold;
  83   font-size: 1.1em;
  84 }
  85 span#email {
  86 }
  87 span#revision {
  88   font-family: sans-serif;
  89 }
  90
  91 div#footer {
  92   font-family: sans-serif;
  93   font-size: small;
  94   border-top: 2px solid silver;
  95   padding-top: 0.5em;
  96   margin-top: 4.0em;
  97 }
  98 div#footer-text {
  99   float: left;
 100   padding-bottom: 0.5em;
 101 }
 102 div#footer-badges {
 103   float: right;
 104   padding-bottom: 0.5em;
 105 }
 106
 107 div#preamble,
 108 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 109 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 110 div.admonitionblock {
 111   margin-right: 10%;
 112   margin-top: 1.5em;
 113   margin-bottom: 1.5em;
 114 }
 115 div.admonitionblock {
 116   margin-top: 2.5em;
 117   margin-bottom: 2.5em;
 118 }
 119
 120 div.content { /* Block element content. */
 121   padding: 0;
 122 }
 123
 124 /* Block element titles. */
 125 div.title, caption.title {
 126   font-family: sans-serif;
 127   font-weight: bold;
 128   text-align: left;
 129   margin-top: 1.0em;
 130   margin-bottom: 0.5em;
 131 }
 132 div.title + * {
 133   margin-top: 0;
 134 }
 135
 136 td div.title:first-child {
 137   margin-top: 0.0em;
 138 }
 139 div.content div.title:first-child {
 140   margin-top: 0.0em;
 141 }
 142 div.content + div.title {
 143   margin-top: 0.0em;
 144 }
 145
 146 div.sidebarblock > div.content {
 147   background: #ffffee;
 148   border: 1px solid silver;
 149   padding: 0.5em;
 150 }
 151
 152 div.listingblock {
 153   margin-right: 0%;
 154 }
 155 div.listingblock > div.content {
 156   border: 1px solid silver;
 157   background: #f4f4f4;
 158   padding: 0.5em;
 159 }
 160
 161 div.quoteblock > div.content {
 162   padding-left: 2.0em;
 163 }
 164
 165 div.attribution {
 166   text-align: right;
 167 }
 168 div.verseblock + div.attribution {
 169   text-align: left;
 170 }
 171
 172 div.admonitionblock .icon {
 173   vertical-align: top;
 174   font-size: 1.1em;
 175   font-weight: bold;
 176   text-decoration: underline;
 177   color: #527bbd;
 178   padding-right: 0.5em;
 179 }
 180 div.admonitionblock td.content {
 181   padding-left: 0.5em;
 182   border-left: 2px solid silver;
 183 }
 184
 185 div.exampleblock > div.content {
 186   border-left: 2px solid silver;
 187   padding: 0.5em;
 188 }
 189
 190 div.verseblock div.content {
 191   white-space: pre;
 192 }
 193
 194 div.imageblock div.content { padding-left: 0; }
 195 div.imageblock img { border: 1px solid silver; }
 196 span.image img { border-style: none; }
 197
 198 dl {
 199   margin-top: 0.8em;
 200   margin-bottom: 0.8em;
 201 }
 202 dt {
 203   margin-top: 0.5em;
 204   margin-bottom: 0;
 205   font-style: italic;
 206 }
 207 dd > *:first-child {
 208   margin-top: 0;
 209 }
 210
 211 ul, ol {
 212     list-style-position: outside;
 213 }
 214 div.olist2 ol {
 215   list-style-type: lower-alpha;
 216 }
 217
 218 div.tableblock > table {
 219   border: 3px solid #527bbd;
 220 }
 221 thead {
 222   font-family: sans-serif;
 223   font-weight: bold;
 224 }
 225 tfoot {
 226   font-weight: bold;
 227 }
 228
 229 div.hlist {
 230   margin-top: 0.8em;
 231   margin-bottom: 0.8em;
 232 }
 233 div.hlist td {
 234   padding-bottom: 5px;
 235 }
 236 td.hlist1 {
 237   vertical-align: top;
 238   font-style: italic;
 239   padding-right: 0.8em;
 240 }
 241 td.hlist2 {
 242   vertical-align: top;
 243 }
 244
 245 @media print {
 246   div#footer-badges { display: none; }
 247 }
 248
 249 div#toctitle {
 250   color: #527bbd;
 251   font-family: sans-serif;
 252   font-size: 1.1em;
 253   font-weight: bold;
 254   margin-top: 1.0em;
 255   margin-bottom: 0.1em;
 256 }
 257
 258 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 259   margin-top: 0;
 260   margin-bottom: 0;
 261 }
 262 div.toclevel2 {
 263   margin-left: 2em;
 264   font-size: 0.9em;
 265 }
 266 div.toclevel3 {
 267   margin-left: 4em;
 268   font-size: 0.9em;
 269 }
 270 div.toclevel4 {
 271   margin-left: 6em;
 272   font-size: 0.9em;
 273 }
 274 include1::./stylesheets/xhtml11-manpage.css[]
 275 /* Workarounds for IE6's broken and incomplete CSS2. */
 276
 277 div.sidebar-content {
 278   background: #ffffee;
 279   border: 1px solid silver;
 280   padding: 0.5em;
 281 }
 282 div.sidebar-title, div.image-title {
 283   font-family: sans-serif;
 284   font-weight: bold;
 285   margin-top: 0.0em;
 286   margin-bottom: 0.5em;
 287 }
 288
 289 div.listingblock div.content {
 290   border: 1px solid silver;
 291   background: #f4f4f4;
 292   padding: 0.5em;
 293 }
 294
 295 div.quoteblock-content {
 296   padding-left: 2.0em;
 297 }
 298
 299 div.exampleblock-content {
 300   border-left: 2px solid silver;
 301   padding-left: 0.5em;
 302 }
 303
 304 /* IE6 sets dynamically generated links as visited. */
 305 div#toc a:visited { color: blue; }
 306 </style>
 307 <title>git-stash(1)</title>
 308 </head>
 309 <body>
 310 <div id="header">
 311 <h1>
 312 git-stash(1) Manual Page
 313 </h1>
 314 <h2>NAME</h2>
 315 <div class="sectionbody">
 316 <p>git-stash -
 317    Stash the changes in a dirty working directory away
 318 </p>
 319 </div>
 320 </div>
 321 <h2>SYNOPSIS</h2>
 322 <div class="sectionbody">
 323 <div class="verseblock">
 324 <div class="content"><em>git stash</em> list [&lt;options&gt;]
 325 <em>git stash</em> ( show | drop ) [&lt;stash&gt;]
 326 <em>git stash</em> ( pop | apply ) [--index] [&lt;stash&gt;]
 327 <em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]
 328 <em>git stash</em> [save [--keep-index] [&lt;message&gt;]]
 329 <em>git stash</em> clear
 330 <em>git stash</em> create</div></div>
 331 </div>
 332 <h2 id="_description">DESCRIPTION</h2>
 333 <div class="sectionbody">
 334 <div class="para"><p>Use <em>git stash</em> when you want to record the current state of the
 335 working directory and the index, but want to go back to a clean
 336 working directory.  The command saves your local modifications away
 337 and reverts the working directory to match the <tt>HEAD</tt> commit.</p></div>
 338 <div class="para"><p>The modifications stashed away by this command can be listed with
 339 <tt>git stash list</tt>, inspected with <tt>git stash show</tt>, and restored
 340 (potentially on top of a different commit) with <tt>git stash apply</tt>.
 341 Calling <tt>git stash</tt> without any arguments is equivalent to <tt>git stash save</tt>.
 342 A stash is by default listed as "WIP on <em>branchname</em> &#8230;", but
 343 you can give a more descriptive message on the command line when
 344 you create one.</p></div>
 345 <div class="para"><p>The latest stash you created is stored in <tt>$GIT_DIR/refs/stash</tt>; older
 346 stashes are found in the reflog of this reference and can be named using
 347 the usual reflog syntax (e.g. <tt>stash@{0}</tt> is the most recently
 348 created stash, <tt>stash@{1}</tt> is the one before it, <tt>stash@{2.hours.ago}</tt>
 349 is also possible).</p></div>
 350 </div>
 351 <h2 id="_options">OPTIONS</h2>
 352 <div class="sectionbody">
 353 <div class="vlist"><dl>
 354 <dt>
 355 save [--keep-index] [&lt;message&gt;]
 356 </dt>
 357 <dd>
 358 <p>
 359         Save your local modifications to a new <em>stash</em>, and run <tt>git reset
 360         --hard</tt> to revert them.  This is the default action when no
 361         subcommand is given. The &lt;message&gt; part is optional and gives
 362         the description along with the stashed state.
 363 </p>
 364 <div class="para"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the
 365 index are left intact.</p></div>
 366 </dd>
 367 <dt>
 368 list [&lt;options&gt;]
 369 </dt>
 370 <dd>
 371 <p>
 372         List the stashes that you currently have.  Each <em>stash</em> is listed
 373         with its name (e.g. <tt>stash@{0}</tt> is the latest stash, <tt>stash@{1}</tt> is
 374         the one before, etc.), the name of the branch that was current when the
 375         stash was made, and a short description of the commit the stash was
 376         based on.
 377 </p>
 378 <div class="listingblock">
 379 <div class="content">
 380 <pre><tt>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
 381 stash@{1}: On master: 9cc0589... Add git-stash</tt></pre>
 382 </div></div>
 383 <div class="para"><p>The command takes options applicable to the <em>git-log</em>
 384 command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p></div>
 385 </dd>
 386 <dt>
 387 show [&lt;stash&gt;]
 388 </dt>
 389 <dd>
 390 <p>
 391         Show the changes recorded in the stash as a diff between the
 392         stashed state and its original parent. When no <tt>&lt;stash&gt;</tt> is given,
 393         shows the latest one. By default, the command shows the diffstat, but
 394         it will accept any format known to <em>git-diff</em> (e.g., <tt>git stash show
 395         -p stash@{1}</tt> to view the second most recent stash in patch form).
 396 </p>
 397 </dd>
 398 <dt>
 399 pop [&lt;stash&gt;]
 400 </dt>
 401 <dd>
 402 <p>
 403         Remove a single stashed state from the stash list and apply it
 404         on top of the current working tree state, i.e., do the inverse
 405         operation of <tt>git stash save</tt>. The working directory must
 406         match the index.
 407 </p>
 408 <div class="para"><p>Applying the state can fail with conflicts; in this case, it is not
 409 removed from the stash list. You need to resolve the conflicts by hand
 410 and call <tt>git stash drop</tt> manually afterwards.</p></div>
 411 <div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working
 412 tree's changes, but also the index's ones. However, this can fail, when you
 413 have conflicts (which are stored in the index, where you therefore can no
 414 longer apply the changes as they were originally).</p></div>
 415 <div class="para"><p>When no <tt>&lt;stash&gt;</tt> is given, <tt>stash@{0}</tt> is assumed.</p></div>
 416 </dd>
 417 <dt>
 418 apply [--index] [&lt;stash&gt;]
 419 </dt>
 420 <dd>
 421 <p>
 422         Like <tt>pop</tt>, but do not remove the state from the stash list.
 423 </p>
 424 </dd>
 425 <dt>
 426 branch &lt;branchname&gt; [&lt;stash&gt;]
 427 </dt>
 428 <dd>
 429 <p>
 430         Creates and checks out a new branch named <tt>&lt;branchname&gt;</tt> starting from
 431         the commit at which the <tt>&lt;stash&gt;</tt> was originally created, applies the
 432         changes recorded in <tt>&lt;stash&gt;</tt> to the new working tree and index, then
 433         drops the <tt>&lt;stash&gt;</tt> if that completes successfully. When no <tt>&lt;stash&gt;</tt>
 434         is given, applies the latest one.
 435 </p>
 436 <div class="para"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has
 437 changed enough that <tt>git stash apply</tt> fails due to conflicts. Since
 438 the stash is applied on top of the commit that was HEAD at the time
 439 <tt>git stash</tt> was run, it restores the originally stashed state with
 440 no conflicts.</p></div>
 441 </dd>
 442 <dt>
 443 clear
 444 </dt>
 445 <dd>
 446 <p>
 447         Remove all the stashed states. Note that those states will then
 448         be subject to pruning, and may be difficult or impossible to recover.
 449 </p>
 450 </dd>
 451 <dt>
 452 drop [&lt;stash&gt;]
 453 </dt>
 454 <dd>
 455 <p>
 456         Remove a single stashed state from the stash list. When no <tt>&lt;stash&gt;</tt>
 457         is given, it removes the latest one. i.e. <tt>stash@{0}</tt>
 458 </p>
 459 </dd>
 460 <dt>
 461 create
 462 </dt>
 463 <dd>
 464 <p>
 465         Create a stash (which is a regular commit object) and return its
 466         object name, without storing it anywhere in the ref namespace.
 467 </p>
 468 </dd>
 469 </dl></div>
 470 </div>
 471 <h2 id="_discussion">DISCUSSION</h2>
 472 <div class="sectionbody">
 473 <div class="para"><p>A stash is represented as a commit whose tree records the state of the
 474 working directory, and its first parent is the commit at <tt>HEAD</tt> when
 475 the stash was created.  The tree of the second parent records the
 476 state of the index when the stash is made, and it is made a child of
 477 the <tt>HEAD</tt> commit.  The ancestry graph looks like this:</p></div>
 478 <div class="literalblock">
 479 <div class="content">
 480 <pre><tt>       .----W
 481       /    /
 482 -----H----I</tt></pre>
 483 </div></div>
 484 <div class="para"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state
 485 of the index, and <tt>W</tt> is a commit that records the state of the working
 486 tree.</p></div>
 487 </div>
 488 <h2 id="_examples">EXAMPLES</h2>
 489 <div class="sectionbody">
 490 <div class="vlist"><dl>
 491 <dt>
 492 Pulling into a dirty tree
 493 </dt>
 494 <dd>
 495 <p>
 496 When you are in the middle of something, you learn that there are
 497 upstream changes that are possibly relevant to what you are
 498 doing.  When your local changes do not conflict with the changes in
 499 the upstream, a simple <tt>git pull</tt> will let you move forward.
 500 </p>
 501 <div class="para"><p>However, there are cases in which your local changes do conflict with
 502 the upstream changes, and <tt>git pull</tt> refuses to overwrite your
 503 changes.  In such a case, you can stash your changes away,
 504 perform a pull, and then unstash, like this:</p></div>
 505 <div class="listingblock">
 506 <div class="content">
 507 <pre><tt>$ git pull
 508  ...
 509 file foobar not up to date, cannot merge.
 510 $ git stash
 511 $ git pull
 512 $ git stash pop</tt></pre>
 513 </div></div>
 514 </dd>
 515 <dt>
 516 Interrupted workflow
 517 </dt>
 518 <dd>
 519 <p>
 520 When you are in the middle of something, your boss comes in and
 521 demands that you fix something immediately.  Traditionally, you would
 522 make a commit to a temporary branch to store your changes away, and
 523 return to your original branch to make the emergency fix, like this:
 524 </p>
 525 <div class="listingblock">
 526 <div class="content">
 527 <pre><tt># ... hack hack hack ...
 528 $ git checkout -b my_wip
 529 $ git commit -a -m "WIP"
 530 $ git checkout master
 531 $ edit emergency fix
 532 $ git commit -a -m "Fix in a hurry"
 533 $ git checkout my_wip
 534 $ git reset --soft HEAD^
 535 # ... continue hacking ...</tt></pre>
 536 </div></div>
 537 <div class="para"><p>You can use <em>git-stash</em> to simplify the above, like this:</p></div>
 538 <div class="listingblock">
 539 <div class="content">
 540 <pre><tt># ... hack hack hack ...
 541 $ git stash
 542 $ edit emergency fix
 543 $ git commit -a -m "Fix in a hurry"
 544 $ git stash pop
 545 # ... continue hacking ...</tt></pre>
 546 </div></div>
 547 </dd>
 548 <dt>
 549 Testing partial commits
 550 </dt>
 551 <dd>
 552 <p>
 553 You can use <tt>git stash save --keep-index</tt> when you want to make two or
 554 more commits out of the changes in the work tree, and you want to test
 555 each change before committing:
 556 </p>
 557 <div class="listingblock">
 558 <div class="content">
 559 <pre><tt># ... hack hack hack ...
 560 $ git add --patch foo            # add just first part to the index
 561 $ git stash save --keep-index    # save all other changes to the stash
 562 $ edit/build/test first part
 563 $ git commit -m 'First part'     # commit fully tested change
 564 $ git stash pop                  # prepare to work on all other changes
 565 # ... repeat above five steps until one commit remains ...
 566 $ edit/build/test remaining parts
 567 $ git commit foo -m 'Remaining parts'</tt></pre>
 568 </div></div>
 569 </dd>
 570 </dl></div>
 571 </div>
 572 <h2 id="_see_also">SEE ALSO</h2>
 573 <div class="sectionbody">
 574 <div class="para"><p><a href="git-checkout.html">git-checkout(1)</a>,
 575 <a href="git-commit.html">git-commit(1)</a>,
 576 <a href="git-reflog.html">git-reflog(1)</a>,
 577 <a href="git-reset.html">git-reset(1)</a></p></div>
 578 </div>
 579 <h2 id="_author">AUTHOR</h2>
 580 <div class="sectionbody">
 581 <div class="para"><p>Written by Nanako Shiraishi &lt;nanako3@bluebottle.com&gt;</p></div>
 582 </div>
 583 <h2 id="_git">GIT</h2>
 584 <div class="sectionbody">
 585 <div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 586 </div>
 587 <div id="footer">
 588 <div id="footer-text">
 589 Last updated 2009-07-01 02:31:04 UTC
 590 </div>
 591 </div>
 592 </body>
 593 </html>