git-restore.html

   1 <?xml version="1.0" encoding="UTF-8"?>
   2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   3     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   5 <head>
   6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
   7 <meta name="generator" content="AsciiDoc 10.2.0" />
   8 <title>git-restore(1)</title>
   9 <style type="text/css">
  10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
  11
  12 /* Default font. */
  13 body {
  14   font-family: Georgia,serif;
  15 }
  16
  17 /* Title font. */
  18 h1, h2, h3, h4, h5, h6,
  19 div.title, caption.title,
  20 thead, p.table.header,
  21 #toctitle,
  22 #author, #revnumber, #revdate, #revremark,
  23 #footer {
  24   font-family: Arial,Helvetica,sans-serif;
  25 }
  26
  27 body {
  28   margin: 1em 5% 1em 5%;
  29 }
  30
  31 a {
  32   color: blue;
  33   text-decoration: underline;
  34 }
  35 a:visited {
  36   color: fuchsia;
  37 }
  38
  39 em {
  40   font-style: italic;
  41   color: navy;
  42 }
  43
  44 strong {
  45   font-weight: bold;
  46   color: #083194;
  47 }
  48
  49 h1, h2, h3, h4, h5, h6 {
  50   color: #527bbd;
  51   margin-top: 1.2em;
  52   margin-bottom: 0.5em;
  53   line-height: 1.3;
  54 }
  55
  56 h1, h2, h3 {
  57   border-bottom: 2px solid silver;
  58 }
  59 h2 {
  60   padding-top: 0.5em;
  61 }
  62 h3 {
  63   float: left;
  64 }
  65 h3 + * {
  66   clear: left;
  67 }
  68 h5 {
  69   font-size: 1.0em;
  70 }
  71
  72 div.sectionbody {
  73   margin-left: 0;
  74 }
  75
  76 hr {
  77   border: 1px solid silver;
  78 }
  79
  80 p {
  81   margin-top: 0.5em;
  82   margin-bottom: 0.5em;
  83 }
  84
  85 ul, ol, li > p {
  86   margin-top: 0;
  87 }
  88 ul > li     { color: #aaa; }
  89 ul > li > * { color: black; }
  90
  91 .monospaced, code, pre {
  92   font-family: "Courier New", Courier, monospace;
  93   font-size: inherit;
  94   color: navy;
  95   padding: 0;
  96   margin: 0;
  97 }
  98 pre {
  99   white-space: pre-wrap;
 100 }
 101
 102 #author {
 103   color: #527bbd;
 104   font-weight: bold;
 105   font-size: 1.1em;
 106 }
 107 #email {
 108 }
 109 #revnumber, #revdate, #revremark {
 110 }
 111
 112 #footer {
 113   font-size: small;
 114   border-top: 2px solid silver;
 115   padding-top: 0.5em;
 116   margin-top: 4.0em;
 117 }
 118 #footer-text {
 119   float: left;
 120   padding-bottom: 0.5em;
 121 }
 122 #footer-badges {
 123   float: right;
 124   padding-bottom: 0.5em;
 125 }
 126
 127 #preamble {
 128   margin-top: 1.5em;
 129   margin-bottom: 1.5em;
 130 }
 131 div.imageblock, div.exampleblock, div.verseblock,
 132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 133 div.admonitionblock {
 134   margin-top: 1.0em;
 135   margin-bottom: 1.5em;
 136 }
 137 div.admonitionblock {
 138   margin-top: 2.0em;
 139   margin-bottom: 2.0em;
 140   margin-right: 10%;
 141   color: #606060;
 142 }
 143
 144 div.content { /* Block element content. */
 145   padding: 0;
 146 }
 147
 148 /* Block element titles. */
 149 div.title, caption.title {
 150   color: #527bbd;
 151   font-weight: bold;
 152   text-align: left;
 153   margin-top: 1.0em;
 154   margin-bottom: 0.5em;
 155 }
 156 div.title + * {
 157   margin-top: 0;
 158 }
 159
 160 td div.title:first-child {
 161   margin-top: 0.0em;
 162 }
 163 div.content div.title:first-child {
 164   margin-top: 0.0em;
 165 }
 166 div.content + div.title {
 167   margin-top: 0.0em;
 168 }
 169
 170 div.sidebarblock > div.content {
 171   background: #ffffee;
 172   border: 1px solid #dddddd;
 173   border-left: 4px solid #f0f0f0;
 174   padding: 0.5em;
 175 }
 176
 177 div.listingblock > div.content {
 178   border: 1px solid #dddddd;
 179   border-left: 5px solid #f0f0f0;
 180   background: #f8f8f8;
 181   padding: 0.5em;
 182 }
 183
 184 div.quoteblock, div.verseblock {
 185   padding-left: 1.0em;
 186   margin-left: 1.0em;
 187   margin-right: 10%;
 188   border-left: 5px solid #f0f0f0;
 189   color: #888;
 190 }
 191
 192 div.quoteblock > div.attribution {
 193   padding-top: 0.5em;
 194   text-align: right;
 195 }
 196
 197 div.verseblock > pre.content {
 198   font-family: inherit;
 199   font-size: inherit;
 200 }
 201 div.verseblock > div.attribution {
 202   padding-top: 0.75em;
 203   text-align: left;
 204 }
 205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 206 div.verseblock + div.attribution {
 207   text-align: left;
 208 }
 209
 210 div.admonitionblock .icon {
 211   vertical-align: top;
 212   font-size: 1.1em;
 213   font-weight: bold;
 214   text-decoration: underline;
 215   color: #527bbd;
 216   padding-right: 0.5em;
 217 }
 218 div.admonitionblock td.content {
 219   padding-left: 0.5em;
 220   border-left: 3px solid #dddddd;
 221 }
 222
 223 div.exampleblock > div.content {
 224   border-left: 3px solid #dddddd;
 225   padding-left: 0.5em;
 226 }
 227
 228 div.imageblock div.content { padding-left: 0; }
 229 span.image img { border-style: none; vertical-align: text-bottom; }
 230 a.image:visited { color: white; }
 231
 232 dl {
 233   margin-top: 0.8em;
 234   margin-bottom: 0.8em;
 235 }
 236 dt {
 237   margin-top: 0.5em;
 238   margin-bottom: 0;
 239   font-style: normal;
 240   color: navy;
 241 }
 242 dd > *:first-child {
 243   margin-top: 0.1em;
 244 }
 245
 246 ul, ol {
 247     list-style-position: outside;
 248 }
 249 ol.arabic {
 250   list-style-type: decimal;
 251 }
 252 ol.loweralpha {
 253   list-style-type: lower-alpha;
 254 }
 255 ol.upperalpha {
 256   list-style-type: upper-alpha;
 257 }
 258 ol.lowerroman {
 259   list-style-type: lower-roman;
 260 }
 261 ol.upperroman {
 262   list-style-type: upper-roman;
 263 }
 264
 265 div.compact ul, div.compact ol,
 266 div.compact p, div.compact p,
 267 div.compact div, div.compact div {
 268   margin-top: 0.1em;
 269   margin-bottom: 0.1em;
 270 }
 271
 272 tfoot {
 273   font-weight: bold;
 274 }
 275 td > div.verse {
 276   white-space: pre;
 277 }
 278
 279 div.hdlist {
 280   margin-top: 0.8em;
 281   margin-bottom: 0.8em;
 282 }
 283 div.hdlist tr {
 284   padding-bottom: 15px;
 285 }
 286 dt.hdlist1.strong, td.hdlist1.strong {
 287   font-weight: bold;
 288 }
 289 td.hdlist1 {
 290   vertical-align: top;
 291   font-style: normal;
 292   padding-right: 0.8em;
 293   color: navy;
 294 }
 295 td.hdlist2 {
 296   vertical-align: top;
 297 }
 298 div.hdlist.compact tr {
 299   margin: 0;
 300   padding-bottom: 0;
 301 }
 302
 303 .comment {
 304   background: yellow;
 305 }
 306
 307 .footnote, .footnoteref {
 308   font-size: 0.8em;
 309 }
 310
 311 span.footnote, span.footnoteref {
 312   vertical-align: super;
 313 }
 314
 315 #footnotes {
 316   margin: 20px 0 20px 0;
 317   padding: 7px 0 0 0;
 318 }
 319
 320 #footnotes div.footnote {
 321   margin: 0 0 5px 0;
 322 }
 323
 324 #footnotes hr {
 325   border: none;
 326   border-top: 1px solid silver;
 327   height: 1px;
 328   text-align: left;
 329   margin-left: 0;
 330   width: 20%;
 331   min-width: 100px;
 332 }
 333
 334 div.colist td {
 335   padding-right: 0.5em;
 336   padding-bottom: 0.3em;
 337   vertical-align: top;
 338 }
 339 div.colist td img {
 340   margin-top: 0.3em;
 341 }
 342
 343 @media print {
 344   #footer-badges { display: none; }
 345 }
 346
 347 #toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 #toctitle {
 352   color: #527bbd;
 353   font-size: 1.1em;
 354   font-weight: bold;
 355   margin-top: 1.0em;
 356   margin-bottom: 0.1em;
 357 }
 358
 359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 360   margin-top: 0;
 361   margin-bottom: 0;
 362 }
 363 div.toclevel2 {
 364   margin-left: 2em;
 365   font-size: 0.9em;
 366 }
 367 div.toclevel3 {
 368   margin-left: 4em;
 369   font-size: 0.9em;
 370 }
 371 div.toclevel4 {
 372   margin-left: 6em;
 373   font-size: 0.9em;
 374 }
 375
 376 span.aqua { color: aqua; }
 377 span.black { color: black; }
 378 span.blue { color: blue; }
 379 span.fuchsia { color: fuchsia; }
 380 span.gray { color: gray; }
 381 span.green { color: green; }
 382 span.lime { color: lime; }
 383 span.maroon { color: maroon; }
 384 span.navy { color: navy; }
 385 span.olive { color: olive; }
 386 span.purple { color: purple; }
 387 span.red { color: red; }
 388 span.silver { color: silver; }
 389 span.teal { color: teal; }
 390 span.white { color: white; }
 391 span.yellow { color: yellow; }
 392
 393 span.aqua-background { background: aqua; }
 394 span.black-background { background: black; }
 395 span.blue-background { background: blue; }
 396 span.fuchsia-background { background: fuchsia; }
 397 span.gray-background { background: gray; }
 398 span.green-background { background: green; }
 399 span.lime-background { background: lime; }
 400 span.maroon-background { background: maroon; }
 401 span.navy-background { background: navy; }
 402 span.olive-background { background: olive; }
 403 span.purple-background { background: purple; }
 404 span.red-background { background: red; }
 405 span.silver-background { background: silver; }
 406 span.teal-background { background: teal; }
 407 span.white-background { background: white; }
 408 span.yellow-background { background: yellow; }
 409
 410 span.big { font-size: 2em; }
 411 span.small { font-size: 0.6em; }
 412
 413 span.underline { text-decoration: underline; }
 414 span.overline { text-decoration: overline; }
 415 span.line-through { text-decoration: line-through; }
 416
 417 div.unbreakable { page-break-inside: avoid; }
 418
 419
 420 /*
 421  * xhtml11 specific
 422  *
 423  * */
 424
 425 div.tableblock {
 426   margin-top: 1.0em;
 427   margin-bottom: 1.5em;
 428 }
 429 div.tableblock > table {
 430   border: 3px solid #527bbd;
 431 }
 432 thead, p.table.header {
 433   font-weight: bold;
 434   color: #527bbd;
 435 }
 436 p.table {
 437   margin-top: 0;
 438 }
 439 /* Because the table frame attribute is overridden by CSS in most browsers. */
 440 div.tableblock > table[frame="void"] {
 441   border-style: none;
 442 }
 443 div.tableblock > table[frame="hsides"] {
 444   border-left-style: none;
 445   border-right-style: none;
 446 }
 447 div.tableblock > table[frame="vsides"] {
 448   border-top-style: none;
 449   border-bottom-style: none;
 450 }
 451
 452
 453 /*
 454  * html5 specific
 455  *
 456  * */
 457
 458 table.tableblock {
 459   margin-top: 1.0em;
 460   margin-bottom: 1.5em;
 461 }
 462 thead, p.tableblock.header {
 463   font-weight: bold;
 464   color: #527bbd;
 465 }
 466 p.tableblock {
 467   margin-top: 0;
 468 }
 469 table.tableblock {
 470   border-width: 3px;
 471   border-spacing: 0px;
 472   border-style: solid;
 473   border-color: #527bbd;
 474   border-collapse: collapse;
 475 }
 476 th.tableblock, td.tableblock {
 477   border-width: 1px;
 478   padding: 4px;
 479   border-style: solid;
 480   border-color: #527bbd;
 481 }
 482
 483 table.tableblock.frame-topbot {
 484   border-left-style: hidden;
 485   border-right-style: hidden;
 486 }
 487 table.tableblock.frame-sides {
 488   border-top-style: hidden;
 489   border-bottom-style: hidden;
 490 }
 491 table.tableblock.frame-none {
 492   border-style: hidden;
 493 }
 494
 495 th.tableblock.halign-left, td.tableblock.halign-left {
 496   text-align: left;
 497 }
 498 th.tableblock.halign-center, td.tableblock.halign-center {
 499   text-align: center;
 500 }
 501 th.tableblock.halign-right, td.tableblock.halign-right {
 502   text-align: right;
 503 }
 504
 505 th.tableblock.valign-top, td.tableblock.valign-top {
 506   vertical-align: top;
 507 }
 508 th.tableblock.valign-middle, td.tableblock.valign-middle {
 509   vertical-align: middle;
 510 }
 511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 512   vertical-align: bottom;
 513 }
 514
 515
 516 /*
 517  * manpage specific
 518  *
 519  * */
 520
 521 body.manpage h1 {
 522   padding-top: 0.5em;
 523   padding-bottom: 0.5em;
 524   border-top: 2px solid silver;
 525   border-bottom: 2px solid silver;
 526 }
 527 body.manpage h2 {
 528   border-style: none;
 529 }
 530 body.manpage div.sectionbody {
 531   margin-left: 3em;
 532 }
 533
 534 @media print {
 535   body.manpage div#toc { display: none; }
 536 }
 537
 538
 539 </style>
 540 <script type="text/javascript">
 541 /*<![CDATA[*/
 542 var asciidoc = {  // Namespace.
 543
 544 /////////////////////////////////////////////////////////////////////
 545 // Table Of Contents generator
 546 /////////////////////////////////////////////////////////////////////
 547
 548 /* Author: Mihai Bazon, September 2002
 549  * http://students.infoiasi.ro/~mishoo
 550  *
 551  * Table Of Content generator
 552  * Version: 0.4
 553  *
 554  * Feel free to use this script under the terms of the GNU General Public
 555  * License, as long as you do not remove or alter this notice.
 556  */
 557
 558  /* modified by Troy D. Hanson, September 2006. License: GPL */
 559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 560
 561 // toclevels = 1..4.
 562 toc: function (toclevels) {
 563
 564   function getText(el) {
 565     var text = "";
 566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 568         text += i.data;
 569       else if (i.firstChild != null)
 570         text += getText(i);
 571     }
 572     return text;
 573   }
 574
 575   function TocEntry(el, text, toclevel) {
 576     this.element = el;
 577     this.text = text;
 578     this.toclevel = toclevel;
 579   }
 580
 581   function tocEntries(el, toclevels) {
 582     var result = new Array;
 583     var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
 584     // Function that scans the DOM tree for header elements (the DOM2
 585     // nodeIterator API would be a better technique but not supported by all
 586     // browsers).
 587     var iterate = function (el) {
 588       for (var i = el.firstChild; i != null; i = i.nextSibling) {
 589         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 590           var mo = re.exec(i.tagName);
 591           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 592             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 593           }
 594           iterate(i);
 595         }
 596       }
 597     }
 598     iterate(el);
 599     return result;
 600   }
 601
 602   var toc = document.getElementById("toc");
 603   if (!toc) {
 604     return;
 605   }
 606
 607   // Delete existing TOC entries in case we're reloading the TOC.
 608   var tocEntriesToRemove = [];
 609   var i;
 610   for (i = 0; i < toc.childNodes.length; i++) {
 611     var entry = toc.childNodes[i];
 612     if (entry.nodeName.toLowerCase() == 'div'
 613      && entry.getAttribute("class")
 614      && entry.getAttribute("class").match(/^toclevel/))
 615       tocEntriesToRemove.push(entry);
 616   }
 617   for (i = 0; i < tocEntriesToRemove.length; i++) {
 618     toc.removeChild(tocEntriesToRemove[i]);
 619   }
 620
 621   // Rebuild TOC entries.
 622   var entries = tocEntries(document.getElementById("content"), toclevels);
 623   for (var i = 0; i < entries.length; ++i) {
 624     var entry = entries[i];
 625     if (entry.element.id == "")
 626       entry.element.id = "_toc_" + i;
 627     var a = document.createElement("a");
 628     a.href = "#" + entry.element.id;
 629     a.appendChild(document.createTextNode(entry.text));
 630     var div = document.createElement("div");
 631     div.appendChild(a);
 632     div.className = "toclevel" + entry.toclevel;
 633     toc.appendChild(div);
 634   }
 635   if (entries.length == 0)
 636     toc.parentNode.removeChild(toc);
 637 },
 638
 639
 640 /////////////////////////////////////////////////////////////////////
 641 // Footnotes generator
 642 /////////////////////////////////////////////////////////////////////
 643
 644 /* Based on footnote generation code from:
 645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 646  */
 647
 648 footnotes: function () {
 649   // Delete existing footnote entries in case we're reloading the footnodes.
 650   var i;
 651   var noteholder = document.getElementById("footnotes");
 652   if (!noteholder) {
 653     return;
 654   }
 655   var entriesToRemove = [];
 656   for (i = 0; i < noteholder.childNodes.length; i++) {
 657     var entry = noteholder.childNodes[i];
 658     if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
 659       entriesToRemove.push(entry);
 660   }
 661   for (i = 0; i < entriesToRemove.length; i++) {
 662     noteholder.removeChild(entriesToRemove[i]);
 663   }
 664
 665   // Rebuild footnote entries.
 666   var cont = document.getElementById("content");
 667   var spans = cont.getElementsByTagName("span");
 668   var refs = {};
 669   var n = 0;
 670   for (i=0; i<spans.length; i++) {
 671     if (spans[i].className == "footnote") {
 672       n++;
 673       var note = spans[i].getAttribute("data-note");
 674       if (!note) {
 675         // Use [\s\S] in place of . so multi-line matches work.
 676         // Because JavaScript has no s (dotall) regex flag.
 677         note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 678         spans[i].innerHTML =
 679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 680           "' title='View footnote' class='footnote'>" + n + "</a>]";
 681         spans[i].setAttribute("data-note", note);
 682       }
 683       noteholder.innerHTML +=
 684         "<div class='footnote' id='_footnote_" + n + "'>" +
 685         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 686         n + "</a>. " + note + "</div>";
 687       var id =spans[i].getAttribute("id");
 688       if (id != null) refs["#"+id] = n;
 689     }
 690   }
 691   if (n == 0)
 692     noteholder.parentNode.removeChild(noteholder);
 693   else {
 694     // Process footnoterefs.
 695     for (i=0; i<spans.length; i++) {
 696       if (spans[i].className == "footnoteref") {
 697         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 698         href = href.match(/#.*/)[0];  // Because IE return full URL.
 699         n = refs[href];
 700         spans[i].innerHTML =
 701           "[<a href='#_footnote_" + n +
 702           "' title='View footnote' class='footnote'>" + n + "</a>]";
 703       }
 704     }
 705   }
 706 },
 707
 708 install: function(toclevels) {
 709   var timerId;
 710
 711   function reinstall() {
 712     asciidoc.footnotes();
 713     if (toclevels) {
 714       asciidoc.toc(toclevels);
 715     }
 716   }
 717
 718   function reinstallAndRemoveTimer() {
 719     clearInterval(timerId);
 720     reinstall();
 721   }
 722
 723   timerId = setInterval(reinstall, 500);
 724   if (document.addEventListener)
 725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 726   else
 727     window.onload = reinstallAndRemoveTimer;
 728 }
 729
 730 }
 731 asciidoc.install();
 732 /*]]>*/
 733 </script>
 734 </head>
 735 <body class="manpage">
 736 <div id="header">
 737 <h1>
 738 git-restore(1) Manual Page
 739 </h1>
 740 <h2>NAME</h2>
 741 <div class="sectionbody">
 742 <p>git-restore -
 743    Restore working tree files
 744 </p>
 745 </div>
 746 </div>
 747 <div id="content">
 748 <div class="sect1">
 749 <h2 id="_synopsis">SYNOPSIS</h2>
 750 <div class="sectionbody">
 751 <div class="verseblock">
 752 <pre class="content"><em>git restore</em> [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] [--] &lt;pathspec&gt;&#8230;
 753 <em>git restore</em> [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] --pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]
 754 <em>git restore</em> (-p|--patch) [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] [--] [&lt;pathspec&gt;&#8230;]</pre>
 755 <div class="attribution">
 756 </div></div>
 757 </div>
 758 </div>
 759 <div class="sect1">
 760 <h2 id="_description">DESCRIPTION</h2>
 761 <div class="sectionbody">
 762 <div class="paragraph"><p>Restore specified paths in the working tree with some contents from a
 763 restore source. If a path is tracked but does not exist in the restore
 764 source, it will be removed to match the source.</p></div>
 765 <div class="paragraph"><p>The command can also be used to restore the content in the index with
 766 <code>--staged</code>, or restore both the working tree and the index with
 767 <code>--staged --worktree</code>.</p></div>
 768 <div class="paragraph"><p>By default, if <code>--staged</code> is given, the contents are restored from <code>HEAD</code>,
 769 otherwise from the index. Use <code>--source</code> to restore from a different commit.</p></div>
 770 <div class="paragraph"><p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences
 771 between the three commands.</p></div>
 772 <div class="paragraph"><p>THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.</p></div>
 773 </div>
 774 </div>
 775 <div class="sect1">
 776 <h2 id="_options">OPTIONS</h2>
 777 <div class="sectionbody">
 778 <div class="dlist"><dl>
 779 <dt class="hdlist1">
 780 -s &lt;tree&gt;
 781 </dt>
 782 <dt class="hdlist1">
 783 --source=&lt;tree&gt;
 784 </dt>
 785 <dd>
 786 <p>
 787         Restore the working tree files with the content from the given
 788         tree. It is common to specify the source tree by naming a
 789         commit, branch or tag associated with it.
 790 </p>
 791 <div class="paragraph"><p>If not specified, the contents are restored from <code>HEAD</code> if <code>--staged</code> is
 792 given, otherwise from the index.</p></div>
 793 <div class="paragraph"><p>As a special case, you may use <code>"A...B"</code> as a shortcut for the
 794 merge base of <code>A</code> and <code>B</code> if there is exactly one merge base. You can
 795 leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p></div>
 796 </dd>
 797 <dt class="hdlist1">
 798 -p
 799 </dt>
 800 <dt class="hdlist1">
 801 --patch
 802 </dt>
 803 <dd>
 804 <p>
 805         Interactively select hunks in the difference between the
 806         restore source and the restore location. See the &#8220;Interactive
 807         Mode&#8221; section of <a href="git-add.html">git-add(1)</a> to learn how to operate
 808         the <code>--patch</code> mode.
 809 </p>
 810 <div class="paragraph"><p>Note that <code>--patch</code> can accept no pathspec and will prompt to restore
 811 all modified paths.</p></div>
 812 </dd>
 813 <dt class="hdlist1">
 814 -W
 815 </dt>
 816 <dt class="hdlist1">
 817 --worktree
 818 </dt>
 819 <dt class="hdlist1">
 820 -S
 821 </dt>
 822 <dt class="hdlist1">
 823 --staged
 824 </dt>
 825 <dd>
 826 <p>
 827         Specify the restore location. If neither option is specified,
 828         by default the working tree is restored. Specifying <code>--staged</code>
 829         will only restore the index. Specifying both restores both.
 830 </p>
 831 </dd>
 832 <dt class="hdlist1">
 833 -q
 834 </dt>
 835 <dt class="hdlist1">
 836 --quiet
 837 </dt>
 838 <dd>
 839 <p>
 840         Quiet, suppress feedback messages. Implies <code>--no-progress</code>.
 841 </p>
 842 </dd>
 843 <dt class="hdlist1">
 844 --progress
 845 </dt>
 846 <dt class="hdlist1">
 847 --no-progress
 848 </dt>
 849 <dd>
 850 <p>
 851         Progress status is reported on the standard error stream
 852         by default when it is attached to a terminal, unless <code>--quiet</code>
 853         is specified. This flag enables progress reporting even if not
 854         attached to a terminal, regardless of <code>--quiet</code>.
 855 </p>
 856 </dd>
 857 <dt class="hdlist1">
 858 --ours
 859 </dt>
 860 <dt class="hdlist1">
 861 --theirs
 862 </dt>
 863 <dd>
 864 <p>
 865         When restoring files in the working tree from the index, use
 866         stage #2 (<em>ours</em>) or #3 (<em>theirs</em>) for unmerged paths.
 867         This option cannot be used when checking out paths from a
 868         tree-ish (i.e. with the <code>--source</code> option).
 869 </p>
 870 <div class="paragraph"><p>Note that during <code>git rebase</code> and <code>git pull --rebase</code>, <em>ours</em> and
 871 <em>theirs</em> may appear swapped. See the explanation of the same options
 872 in <a href="git-checkout.html">git-checkout(1)</a> for details.</p></div>
 873 </dd>
 874 <dt class="hdlist1">
 875 -m
 876 </dt>
 877 <dt class="hdlist1">
 878 --merge
 879 </dt>
 880 <dd>
 881 <p>
 882         When restoring files on the working tree from the index,
 883         recreate the conflicted merge in the unmerged paths.
 884         This option cannot be used when checking out paths from a
 885         tree-ish (i.e. with the <code>--source</code> option).
 886 </p>
 887 </dd>
 888 <dt class="hdlist1">
 889 --conflict=&lt;style&gt;
 890 </dt>
 891 <dd>
 892 <p>
 893         The same as <code>--merge</code> option above, but changes the way the
 894         conflicting hunks are presented, overriding the
 895         <code>merge.conflictStyle</code> configuration variable.  Possible values
 896         are "merge" (default), "diff3", and "zdiff3".
 897 </p>
 898 </dd>
 899 <dt class="hdlist1">
 900 --ignore-unmerged
 901 </dt>
 902 <dd>
 903 <p>
 904         When restoring files on the working tree from the index, do
 905         not abort the operation if there are unmerged entries and
 906         neither <code>--ours</code>, <code>--theirs</code>, <code>--merge</code> or <code>--conflict</code> is
 907         specified. Unmerged paths on the working tree are left alone.
 908 </p>
 909 </dd>
 910 <dt class="hdlist1">
 911 --ignore-skip-worktree-bits
 912 </dt>
 913 <dd>
 914 <p>
 915         In sparse checkout mode, the default is to only update entries
 916         matched by <code>&lt;pathspec&gt;</code> and sparse patterns in
 917         $GIT_DIR/info/sparse-checkout. This option ignores the sparse
 918         patterns and unconditionally restores any files in
 919         <code>&lt;pathspec&gt;</code>.
 920 </p>
 921 </dd>
 922 <dt class="hdlist1">
 923 --recurse-submodules
 924 </dt>
 925 <dt class="hdlist1">
 926 --no-recurse-submodules
 927 </dt>
 928 <dd>
 929 <p>
 930         If <code>&lt;pathspec&gt;</code> names an active submodule and the restore location
 931         includes the working tree, the submodule will only be updated if
 932         this option is given, in which case its working tree will be
 933         restored to the commit recorded in the superproject, and any local
 934         modifications overwritten. If nothing (or
 935         <code>--no-recurse-submodules</code>) is used, submodules working trees will
 936         not be updated. Just like <a href="git-checkout.html">git-checkout(1)</a>, this will detach
 937         <code>HEAD</code> of the submodule.
 938 </p>
 939 </dd>
 940 <dt class="hdlist1">
 941 --overlay
 942 </dt>
 943 <dt class="hdlist1">
 944 --no-overlay
 945 </dt>
 946 <dd>
 947 <p>
 948         In overlay mode, the command never removes files when
 949         restoring. In no-overlay mode, tracked files that do not
 950         appear in the <code>--source</code> tree are removed, to make them match
 951         <code>&lt;tree&gt;</code> exactly. The default is no-overlay mode.
 952 </p>
 953 </dd>
 954 <dt class="hdlist1">
 955 --pathspec-from-file=&lt;file&gt;
 956 </dt>
 957 <dd>
 958 <p>
 959         Pathspec is passed in <code>&lt;file&gt;</code> instead of commandline args. If
 960         <code>&lt;file&gt;</code> is exactly <code>-</code> then standard input is used. Pathspec
 961         elements are separated by LF or CR/LF. Pathspec elements can be
 962         quoted as explained for the configuration variable <code>core.quotePath</code>
 963         (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and
 964         global <code>--literal-pathspecs</code>.
 965 </p>
 966 </dd>
 967 <dt class="hdlist1">
 968 --pathspec-file-nul
 969 </dt>
 970 <dd>
 971 <p>
 972         Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are
 973         separated with NUL character and all other characters are taken
 974         literally (including newlines and quotes).
 975 </p>
 976 </dd>
 977 <dt class="hdlist1">
 978 --
 979 </dt>
 980 <dd>
 981 <p>
 982         Do not interpret any more arguments as options.
 983 </p>
 984 </dd>
 985 <dt class="hdlist1">
 986 &lt;pathspec&gt;&#8230;
 987 </dt>
 988 <dd>
 989 <p>
 990         Limits the paths affected by the operation.
 991 </p>
 992 <div class="paragraph"><p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p></div>
 993 </dd>
 994 </dl></div>
 995 </div>
 996 </div>
 997 <div class="sect1">
 998 <h2 id="_examples">EXAMPLES</h2>
 999 <div class="sectionbody">
1000 <div class="paragraph"><p>The following sequence switches to the <code>master</code> branch, reverts the
1001 <code>Makefile</code> to two revisions back, deletes hello.c by mistake, and gets
1002 it back from the index.</p></div>
1003 <div class="listingblock">
1004 <div class="content">
1005 <pre><code>$ git switch master
1006 $ git restore --source master~2 Makefile  <b>&lt;1&gt;</b>
1007 $ rm -f hello.c
1008 $ git restore hello.c                     <b>&lt;2&gt;</b></code></pre>
1009 </div></div>
1010 <div class="colist arabic"><ol>
1011 <li>
1012 <p>
1013 take a file out of another commit
1014 </p>
1015 </li>
1016 <li>
1017 <p>
1018 restore hello.c from the index
1019 </p>
1020 </li>
1021 </ol></div>
1022 <div class="paragraph"><p>If you want to restore <em>all</em> C source files to match the version in
1023 the index, you can say</p></div>
1024 <div class="listingblock">
1025 <div class="content">
1026 <pre><code>$ git restore '*.c'</code></pre>
1027 </div></div>
1028 <div class="paragraph"><p>Note the quotes around <code>*.c</code>.  The file <code>hello.c</code> will also be
1029 restored, even though it is no longer in the working tree, because the
1030 file globbing is used to match entries in the index (not in the
1031 working tree by the shell).</p></div>
1032 <div class="paragraph"><p>To restore all files in the current directory</p></div>
1033 <div class="listingblock">
1034 <div class="content">
1035 <pre><code>$ git restore .</code></pre>
1036 </div></div>
1037 <div class="paragraph"><p>or to restore all working tree files with <em>top</em> pathspec magic (see
1038 <a href="gitglossary.html">gitglossary(7)</a>)</p></div>
1039 <div class="listingblock">
1040 <div class="content">
1041 <pre><code>$ git restore :/</code></pre>
1042 </div></div>
1043 <div class="paragraph"><p>To restore a file in the index to match the version in <code>HEAD</code> (this is
1044 the same as using <a href="git-reset.html">git-reset(1)</a>)</p></div>
1045 <div class="listingblock">
1046 <div class="content">
1047 <pre><code>$ git restore --staged hello.c</code></pre>
1048 </div></div>
1049 <div class="paragraph"><p>or you can restore both the index and the working tree (this is the same
1050 as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div>
1051 <div class="listingblock">
1052 <div class="content">
1053 <pre><code>$ git restore --source=HEAD --staged --worktree hello.c</code></pre>
1054 </div></div>
1055 <div class="paragraph"><p>or the short form which is more practical but less readable:</p></div>
1056 <div class="listingblock">
1057 <div class="content">
1058 <pre><code>$ git restore -s@ -SW hello.c</code></pre>
1059 </div></div>
1060 </div>
1061 </div>
1062 <div class="sect1">
1063 <h2 id="_see_also">SEE ALSO</h2>
1064 <div class="sectionbody">
1065 <div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
1066 <a href="git-reset.html">git-reset(1)</a></p></div>
1067 </div>
1068 </div>
1069 <div class="sect1">
1070 <h2 id="_git">GIT</h2>
1071 <div class="sectionbody">
1072 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1073 </div>
1074 </div>
1075 </div>
1076 <div id="footnotes"><hr /></div>
1077 <div id="footer">
1078 <div id="footer-text">
1079 Last updated
1080  2023-10-23 14:43:46 PDT
1081 </div>
1082 </div>
1083 </body>
1084 </html>