1104 lines
29 KiB
HTML
1104 lines
29 KiB
HTML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
|
<meta name="generator" content="AsciiDoc 10.2.0" />
|
|
<title>git-restore(1)</title>
|
|
<style type="text/css">
|
|
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
|
/* Default font. */
|
|
body {
|
|
font-family: Georgia,serif;
|
|
}
|
|
|
|
/* Title font. */
|
|
h1, h2, h3, h4, h5, h6,
|
|
div.title, caption.title,
|
|
thead, p.table.header,
|
|
#toctitle,
|
|
#author, #revnumber, #revdate, #revremark,
|
|
#footer {
|
|
font-family: Arial,Helvetica,sans-serif;
|
|
}
|
|
|
|
body {
|
|
margin: 1em 5% 1em 5%;
|
|
}
|
|
|
|
a {
|
|
color: blue;
|
|
text-decoration: underline;
|
|
}
|
|
a:visited {
|
|
color: fuchsia;
|
|
}
|
|
|
|
em {
|
|
font-style: italic;
|
|
color: navy;
|
|
}
|
|
|
|
strong {
|
|
font-weight: bold;
|
|
color: #083194;
|
|
}
|
|
|
|
h1, h2, h3, h4, h5, h6 {
|
|
color: #527bbd;
|
|
margin-top: 1.2em;
|
|
margin-bottom: 0.5em;
|
|
line-height: 1.3;
|
|
}
|
|
|
|
h1, h2, h3 {
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
h2 {
|
|
padding-top: 0.5em;
|
|
}
|
|
h3 {
|
|
float: left;
|
|
}
|
|
h3 + * {
|
|
clear: left;
|
|
}
|
|
h5 {
|
|
font-size: 1.0em;
|
|
}
|
|
|
|
div.sectionbody {
|
|
margin-left: 0;
|
|
}
|
|
|
|
hr {
|
|
border: 1px solid silver;
|
|
}
|
|
|
|
p {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
ul, ol, li > p {
|
|
margin-top: 0;
|
|
}
|
|
ul > li { color: #aaa; }
|
|
ul > li > * { color: black; }
|
|
|
|
.monospaced, code, pre {
|
|
font-family: "Courier New", Courier, monospace;
|
|
font-size: inherit;
|
|
color: navy;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
pre {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#author {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
font-size: 1.1em;
|
|
}
|
|
#email {
|
|
}
|
|
#revnumber, #revdate, #revremark {
|
|
}
|
|
|
|
#footer {
|
|
font-size: small;
|
|
border-top: 2px solid silver;
|
|
padding-top: 0.5em;
|
|
margin-top: 4.0em;
|
|
}
|
|
#footer-text {
|
|
float: left;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
#footer-badges {
|
|
float: right;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
#preamble {
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.imageblock, div.exampleblock, div.verseblock,
|
|
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
|
|
div.admonitionblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.admonitionblock {
|
|
margin-top: 2.0em;
|
|
margin-bottom: 2.0em;
|
|
margin-right: 10%;
|
|
color: #606060;
|
|
}
|
|
|
|
div.content { /* Block element content. */
|
|
padding: 0;
|
|
}
|
|
|
|
/* Block element titles. */
|
|
div.title, caption.title {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
text-align: left;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
div.title + * {
|
|
margin-top: 0;
|
|
}
|
|
|
|
td div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content + div.title {
|
|
margin-top: 0.0em;
|
|
}
|
|
|
|
div.sidebarblock > div.content {
|
|
background: #ffffee;
|
|
border: 1px solid #dddddd;
|
|
border-left: 4px solid #f0f0f0;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.listingblock > div.content {
|
|
border: 1px solid #dddddd;
|
|
border-left: 5px solid #f0f0f0;
|
|
background: #f8f8f8;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.quoteblock, div.verseblock {
|
|
padding-left: 1.0em;
|
|
margin-left: 1.0em;
|
|
margin-right: 10%;
|
|
border-left: 5px solid #f0f0f0;
|
|
color: #888;
|
|
}
|
|
|
|
div.quoteblock > div.attribution {
|
|
padding-top: 0.5em;
|
|
text-align: right;
|
|
}
|
|
|
|
div.verseblock > pre.content {
|
|
font-family: inherit;
|
|
font-size: inherit;
|
|
}
|
|
div.verseblock > div.attribution {
|
|
padding-top: 0.75em;
|
|
text-align: left;
|
|
}
|
|
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
|
|
div.verseblock + div.attribution {
|
|
text-align: left;
|
|
}
|
|
|
|
div.admonitionblock .icon {
|
|
vertical-align: top;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
text-decoration: underline;
|
|
color: #527bbd;
|
|
padding-right: 0.5em;
|
|
}
|
|
div.admonitionblock td.content {
|
|
padding-left: 0.5em;
|
|
border-left: 3px solid #dddddd;
|
|
}
|
|
|
|
div.exampleblock > div.content {
|
|
border-left: 3px solid #dddddd;
|
|
padding-left: 0.5em;
|
|
}
|
|
|
|
div.imageblock div.content { padding-left: 0; }
|
|
span.image img { border-style: none; vertical-align: text-bottom; }
|
|
a.image:visited { color: white; }
|
|
|
|
dl {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
dt {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0;
|
|
font-style: normal;
|
|
color: navy;
|
|
}
|
|
dd > *:first-child {
|
|
margin-top: 0.1em;
|
|
}
|
|
|
|
ul, ol {
|
|
list-style-position: outside;
|
|
}
|
|
ol.arabic {
|
|
list-style-type: decimal;
|
|
}
|
|
ol.loweralpha {
|
|
list-style-type: lower-alpha;
|
|
}
|
|
ol.upperalpha {
|
|
list-style-type: upper-alpha;
|
|
}
|
|
ol.lowerroman {
|
|
list-style-type: lower-roman;
|
|
}
|
|
ol.upperroman {
|
|
list-style-type: upper-roman;
|
|
}
|
|
|
|
div.compact ul, div.compact ol,
|
|
div.compact p, div.compact p,
|
|
div.compact div, div.compact div {
|
|
margin-top: 0.1em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
tfoot {
|
|
font-weight: bold;
|
|
}
|
|
td > div.verse {
|
|
white-space: pre;
|
|
}
|
|
|
|
div.hdlist {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
div.hdlist tr {
|
|
padding-bottom: 15px;
|
|
}
|
|
dt.hdlist1.strong, td.hdlist1.strong {
|
|
font-weight: bold;
|
|
}
|
|
td.hdlist1 {
|
|
vertical-align: top;
|
|
font-style: normal;
|
|
padding-right: 0.8em;
|
|
color: navy;
|
|
}
|
|
td.hdlist2 {
|
|
vertical-align: top;
|
|
}
|
|
div.hdlist.compact tr {
|
|
margin: 0;
|
|
padding-bottom: 0;
|
|
}
|
|
|
|
.comment {
|
|
background: yellow;
|
|
}
|
|
|
|
.footnote, .footnoteref {
|
|
font-size: 0.8em;
|
|
}
|
|
|
|
span.footnote, span.footnoteref {
|
|
vertical-align: super;
|
|
}
|
|
|
|
#footnotes {
|
|
margin: 20px 0 20px 0;
|
|
padding: 7px 0 0 0;
|
|
}
|
|
|
|
#footnotes div.footnote {
|
|
margin: 0 0 5px 0;
|
|
}
|
|
|
|
#footnotes hr {
|
|
border: none;
|
|
border-top: 1px solid silver;
|
|
height: 1px;
|
|
text-align: left;
|
|
margin-left: 0;
|
|
width: 20%;
|
|
min-width: 100px;
|
|
}
|
|
|
|
div.colist td {
|
|
padding-right: 0.5em;
|
|
padding-bottom: 0.3em;
|
|
vertical-align: top;
|
|
}
|
|
div.colist td img {
|
|
margin-top: 0.3em;
|
|
}
|
|
|
|
@media print {
|
|
#footer-badges { display: none; }
|
|
}
|
|
|
|
#toc {
|
|
margin-bottom: 2.5em;
|
|
}
|
|
|
|
#toctitle {
|
|
color: #527bbd;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
|
|
margin-top: 0;
|
|
margin-bottom: 0;
|
|
}
|
|
div.toclevel2 {
|
|
margin-left: 2em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel3 {
|
|
margin-left: 4em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel4 {
|
|
margin-left: 6em;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
span.aqua { color: aqua; }
|
|
span.black { color: black; }
|
|
span.blue { color: blue; }
|
|
span.fuchsia { color: fuchsia; }
|
|
span.gray { color: gray; }
|
|
span.green { color: green; }
|
|
span.lime { color: lime; }
|
|
span.maroon { color: maroon; }
|
|
span.navy { color: navy; }
|
|
span.olive { color: olive; }
|
|
span.purple { color: purple; }
|
|
span.red { color: red; }
|
|
span.silver { color: silver; }
|
|
span.teal { color: teal; }
|
|
span.white { color: white; }
|
|
span.yellow { color: yellow; }
|
|
|
|
span.aqua-background { background: aqua; }
|
|
span.black-background { background: black; }
|
|
span.blue-background { background: blue; }
|
|
span.fuchsia-background { background: fuchsia; }
|
|
span.gray-background { background: gray; }
|
|
span.green-background { background: green; }
|
|
span.lime-background { background: lime; }
|
|
span.maroon-background { background: maroon; }
|
|
span.navy-background { background: navy; }
|
|
span.olive-background { background: olive; }
|
|
span.purple-background { background: purple; }
|
|
span.red-background { background: red; }
|
|
span.silver-background { background: silver; }
|
|
span.teal-background { background: teal; }
|
|
span.white-background { background: white; }
|
|
span.yellow-background { background: yellow; }
|
|
|
|
span.big { font-size: 2em; }
|
|
span.small { font-size: 0.6em; }
|
|
|
|
span.underline { text-decoration: underline; }
|
|
span.overline { text-decoration: overline; }
|
|
span.line-through { text-decoration: line-through; }
|
|
|
|
div.unbreakable { page-break-inside: avoid; }
|
|
|
|
|
|
/*
|
|
* xhtml11 specific
|
|
*
|
|
* */
|
|
|
|
div.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.tableblock > table {
|
|
border: 3px solid #527bbd;
|
|
}
|
|
thead, p.table.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.table {
|
|
margin-top: 0;
|
|
}
|
|
/* Because the table frame attribute is overridden by CSS in most browsers. */
|
|
div.tableblock > table[frame="void"] {
|
|
border-style: none;
|
|
}
|
|
div.tableblock > table[frame="hsides"] {
|
|
border-left-style: none;
|
|
border-right-style: none;
|
|
}
|
|
div.tableblock > table[frame="vsides"] {
|
|
border-top-style: none;
|
|
border-bottom-style: none;
|
|
}
|
|
|
|
|
|
/*
|
|
* html5 specific
|
|
*
|
|
* */
|
|
|
|
table.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
thead, p.tableblock.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.tableblock {
|
|
margin-top: 0;
|
|
}
|
|
table.tableblock {
|
|
border-width: 3px;
|
|
border-spacing: 0px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
border-collapse: collapse;
|
|
}
|
|
th.tableblock, td.tableblock {
|
|
border-width: 1px;
|
|
padding: 4px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
}
|
|
|
|
table.tableblock.frame-topbot {
|
|
border-left-style: hidden;
|
|
border-right-style: hidden;
|
|
}
|
|
table.tableblock.frame-sides {
|
|
border-top-style: hidden;
|
|
border-bottom-style: hidden;
|
|
}
|
|
table.tableblock.frame-none {
|
|
border-style: hidden;
|
|
}
|
|
|
|
th.tableblock.halign-left, td.tableblock.halign-left {
|
|
text-align: left;
|
|
}
|
|
th.tableblock.halign-center, td.tableblock.halign-center {
|
|
text-align: center;
|
|
}
|
|
th.tableblock.halign-right, td.tableblock.halign-right {
|
|
text-align: right;
|
|
}
|
|
|
|
th.tableblock.valign-top, td.tableblock.valign-top {
|
|
vertical-align: top;
|
|
}
|
|
th.tableblock.valign-middle, td.tableblock.valign-middle {
|
|
vertical-align: middle;
|
|
}
|
|
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
|
|
vertical-align: bottom;
|
|
}
|
|
|
|
|
|
/*
|
|
* manpage specific
|
|
*
|
|
* */
|
|
|
|
body.manpage h1 {
|
|
padding-top: 0.5em;
|
|
padding-bottom: 0.5em;
|
|
border-top: 2px solid silver;
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
body.manpage h2 {
|
|
border-style: none;
|
|
}
|
|
body.manpage div.sectionbody {
|
|
margin-left: 3em;
|
|
}
|
|
|
|
@media print {
|
|
body.manpage div#toc { display: none; }
|
|
}
|
|
|
|
|
|
</style>
|
|
<script type="text/javascript">
|
|
/*<+'])');
|
|
// Function that scans the DOM tree for header elements (the DOM2
|
|
// nodeIterator API would be a better technique but not supported by all
|
|
// browsers).
|
|
var iterate = function (el) {
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
|
|
var mo = re.exec(i.tagName);
|
|
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
|
|
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
|
|
}
|
|
iterate(i);
|
|
}
|
|
}
|
|
}
|
|
iterate(el);
|
|
return result;
|
|
}
|
|
|
|
var toc = document.getElementById("toc");
|
|
if (!toc) {
|
|
return;
|
|
}
|
|
|
|
// Delete existing TOC entries in case we're reloading the TOC.
|
|
var tocEntriesToRemove = [];
|
|
var i;
|
|
for (i = 0; i < toc.childNodes.length; i++) {
|
|
var entry = toc.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div'
|
|
&& entry.getAttribute("class")
|
|
&& entry.getAttribute("class").match(/^toclevel/))
|
|
tocEntriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < tocEntriesToRemove.length; i++) {
|
|
toc.removeChild(tocEntriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild TOC entries.
|
|
var entries = tocEntries(document.getElementById("content"), toclevels);
|
|
for (var i = 0; i < entries.length; ++i) {
|
|
var entry = entries[i];
|
|
if (entry.element.id == "")
|
|
entry.element.id = "_toc_" + i;
|
|
var a = document.createElement("a");
|
|
a.href = "#" + entry.element.id;
|
|
a.appendChild(document.createTextNode(entry.text));
|
|
var div = document.createElement("div");
|
|
div.appendChild(a);
|
|
div.className = "toclevel" + entry.toclevel;
|
|
toc.appendChild(div);
|
|
}
|
|
if (entries.length == 0)
|
|
toc.parentNode.removeChild(toc);
|
|
},
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Footnotes generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Based on footnote generation code from:
|
|
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
|
|
*/
|
|
|
|
footnotes: function () {
|
|
// Delete existing footnote entries in case we're reloading the footnodes.
|
|
var i;
|
|
var noteholder = document.getElementById("footnotes");
|
|
if (!noteholder) {
|
|
return;
|
|
}
|
|
var entriesToRemove = [];
|
|
for (i = 0; i < noteholder.childNodes.length; i++) {
|
|
var entry = noteholder.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
|
|
entriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < entriesToRemove.length; i++) {
|
|
noteholder.removeChild(entriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild footnote entries.
|
|
var cont = document.getElementById("content");
|
|
var spans = cont.getElementsByTagName("span");
|
|
var refs = {};
|
|
var n = 0;
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnote") {
|
|
n++;
|
|
var note = spans[i].getAttribute("data-note");
|
|
if (!note) {
|
|
// Use [\s\S] in place of . so multi-line matches work.
|
|
// Because JavaScript has no s (dotall) regex flag.
|
|
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
|
|
spans[i].innerHTML =
|
|
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
spans[i].setAttribute("data-note", note);
|
|
}
|
|
noteholder.innerHTML +=
|
|
"<div class='footnote' id='_footnote_" + n + "'>" +
|
|
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
|
|
n + "</a>. " + note + "</div>";
|
|
var id =spans[i].getAttribute("id");
|
|
if (id != null) refs["#"+id] = n;
|
|
}
|
|
}
|
|
if (n == 0)
|
|
noteholder.parentNode.removeChild(noteholder);
|
|
else {
|
|
// Process footnoterefs.
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnoteref") {
|
|
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
|
|
href = href.match(/#.*/)[0]; // Because IE return full URL.
|
|
n = refs[href];
|
|
spans[i].innerHTML =
|
|
"[<a href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
install: function(toclevels) {
|
|
var timerId;
|
|
|
|
function reinstall() {
|
|
asciidoc.footnotes();
|
|
if (toclevels) {
|
|
asciidoc.toc(toclevels);
|
|
}
|
|
}
|
|
|
|
function reinstallAndRemoveTimer() {
|
|
clearInterval(timerId);
|
|
reinstall();
|
|
}
|
|
|
|
timerId = setInterval(reinstall, 500);
|
|
if (document.addEventListener)
|
|
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
|
|
else
|
|
window.onload = reinstallAndRemoveTimer;
|
|
}
|
|
|
|
}
|
|
asciidoc.install();
|
|
/*]]>*/
|
|
</script>
|
|
</head>
|
|
<body class="manpage">
|
|
<div id="header">
|
|
<h1>
|
|
git-restore(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-restore -
|
|
Restore working tree files
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div id="content">
|
|
<div class="sect1">
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
|
<div class="sectionbody">
|
|
<div class="verseblock">
|
|
<pre class="content"><code>git</code> <code>restore</code> [<em><options></em>] [<code>--source=</code><em><tree></em>] [<code>--staged</code>] [<code>--worktree</code>] [<code>--</code>] <em><pathspec></em><span>…</span>
|
|
<code>git</code> <code>restore</code> [<em><options></em>] [<code>--source=</code><em><tree></em>] [<code>--staged</code>] [<code>--worktree</code>] <code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]
|
|
<code>git</code> <code>restore</code> (<code>-p</code>|<code>--patch</code>) [<em><options></em>] [<code>--source=</code><em><tree></em>] [<code>--staged</code>] [<code>--worktree</code>] [<code>--</code>] [<em><pathspec></em><span>…]</span></pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Restore specified paths in the working tree with some contents from a
|
|
restore source. If a path is tracked but does not exist in the restore
|
|
source, it will be removed to match the source.</p></div>
|
|
<div class="paragraph"><p>The command can also be used to restore the content in the index with
|
|
<code>--staged</code>, or restore both the working tree and the index with
|
|
<code>--staged</code> <code>--worktree</code>.</p></div>
|
|
<div class="paragraph"><p>By default, if <code>--staged</code> is given, the contents are restored from <code>HEAD</code>,
|
|
otherwise from the index. Use <code>--source</code> to restore from a different commit.</p></div>
|
|
<div class="paragraph"><p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences
|
|
between the three commands.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>-s</code> <em><tree></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--source=</code><em><tree></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Restore the working tree files with the content from the given
|
|
tree. It is common to specify the source tree by naming a
|
|
commit, branch or tag associated with it.
|
|
</p>
|
|
<div class="paragraph"><p>If not specified, the contents are restored from <code>HEAD</code> if <code>--staged</code> is
|
|
given, otherwise from the index.</p></div>
|
|
<div class="paragraph"><p>As a special case, you may use "<em><rev-A></em><code>...</code><em><rev-B></em>" as a shortcut for the
|
|
merge base of <em><rev-A></em> and <em><rev-B></em> if there is exactly one merge base. You can
|
|
leave out at most one of <em><rev-A>_</em> and <em><rev-B></em>, in which case it defaults to <code>HEAD</code>.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-p</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--patch</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Interactively select hunks in the difference between the
|
|
restore source and the restore location. See the "Interactive
|
|
Mode" section of <a href="git-add.html">git-add(1)</a> to learn how to operate
|
|
the <code>--patch</code> mode.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-U</code><em><n></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--unified=</code><em><n></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate diffs with <em><n></em> lines of context. Defaults to <code>diff.context</code>
|
|
or 3 if the config option is unset.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--inter-hunk-context=</code><em><n></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the context between diff hunks, up to the specified <em><number></em>
|
|
of lines, thereby fusing hunks that are close to each other.
|
|
Defaults to <code>diff.interHunkContext</code> or 0 if the config option
|
|
is unset.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-W</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--worktree</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>-S</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--staged</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Specify the restore location. If neither option is specified,
|
|
by default the working tree is restored. Specifying <code>--staged</code>
|
|
will only restore the index. Specifying both restores both.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-q</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--quiet</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Quiet, suppress feedback messages. Implies <code>--no-progress</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--progress</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-progress</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Progress status is reported on the standard error stream
|
|
by default when it is attached to a terminal, unless <code>--quiet</code>
|
|
is specified. This flag enables progress reporting even if not
|
|
attached to a terminal, regardless of <code>--quiet</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ours</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--theirs</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When restoring files in the working tree from the index, use
|
|
stage #2 (<code>ours</code>) or #3 (<code>theirs</code>) for unmerged paths.
|
|
This option cannot be used when checking out paths from a
|
|
tree-ish (i.e. with the <code>--source</code> option).
|
|
</p>
|
|
<div class="paragraph"><p>Note that during <code>git</code> <code>rebase</code> and <code>git</code> <code>pull</code> <code>--rebase</code>, <code>ours</code> and
|
|
<code>theirs</code> may appear swapped. See the explanation of the same options
|
|
in <a href="git-checkout.html">git-checkout(1)</a> for details.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-m</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--merge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When restoring files on the working tree from the index,
|
|
recreate the conflicted merge in the unmerged paths.
|
|
This option cannot be used when checking out paths from a
|
|
tree-ish (i.e. with the <code>--source</code> option).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--conflict=</code><em><style></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The same as <code>--merge</code> option above, but changes the way the
|
|
conflicting hunks are presented, overriding the
|
|
<code>merge.conflictStyle</code> configuration variable. Possible values
|
|
are <code>merge</code> (default), <code>diff3</code>, and <code>zdiff3</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-unmerged</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When restoring files on the working tree from the index, do
|
|
not abort the operation if there are unmerged entries and
|
|
neither <code>--ours</code>, <code>--theirs</code>, <code>--merge</code> or <code>--conflict</code> is
|
|
specified. Unmerged paths on the working tree are left alone.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-skip-worktree-bits</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
In sparse checkout mode, the default is to only update entries
|
|
matched by <em><pathspec></em> and sparse patterns in
|
|
<code>$GIT_DIR/info/sparse-checkout</code>. This option ignores the sparse
|
|
patterns and unconditionally restores any files in
|
|
<em><pathspec></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--recurse-submodules</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-recurse-submodules</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
If <em><pathspec></em> names an active submodule and the restore location
|
|
includes the working tree, the submodule will only be updated if
|
|
this option is given, in which case its working tree will be
|
|
restored to the commit recorded in the superproject, and any local
|
|
modifications overwritten. If nothing (or
|
|
<code>--no-recurse-submodules</code>) is used, submodules working trees will
|
|
not be updated. Just like <a href="git-checkout.html">git-checkout(1)</a>, this will detach
|
|
<code>HEAD</code> of the submodule.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--overlay</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-overlay</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
In overlay mode, never remove files when restoring. In no-overlay mode,
|
|
remove tracked files that do not appear in the <em><tree></em> of
|
|
<code>--source=</code><em><tree></em>, to make them match <em><tree></em> exactly. The default
|
|
is no-overlay mode.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--pathspec-from-file=</code><em><file></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pathspec is passed in <em><file></em> instead of commandline args. If
|
|
<em><file></em> is exactly <code>-</code> then standard input is used. Pathspec
|
|
elements are separated by <em>LF</em> or <em>CR</em>/<em>LF</em>. Pathspec elements can be
|
|
quoted as explained for the configuration variable <code>core.quotePath</code>
|
|
(see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and
|
|
global <code>--literal-pathspecs</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--pathspec-file-nul</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are
|
|
separated with <em>NUL</em> character and all other characters are taken
|
|
literally (including newlines and quotes).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not interpret any more arguments as options.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<em><pathspec></em>...
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Limits the paths affected by the operation.
|
|
</p>
|
|
<div class="paragraph"><p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p></div>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_examples">EXAMPLES</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The following sequence switches to the <code>master</code> branch, reverts the
|
|
<code>Makefile</code> to two revisions back, deletes <code>hello.c</code> by mistake, and gets
|
|
it back from the index.</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git switch master
|
|
$ git restore --source master~2 Makefile <b><1></b>
|
|
$ rm -f hello.c
|
|
$ git restore hello.c <b><2></b></code></pre>
|
|
</div></div>
|
|
<div class="colist arabic"><ol>
|
|
<li>
|
|
<p>
|
|
take a file out of another commit
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
restore <code>hello.c</code> from the index
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>If you want to restore <em>all</em> C source files to match the version in
|
|
the index, you can say</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore '*.c'</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>Note the quotes around <code>*.c</code>. The file <code>hello.c</code> will also be
|
|
restored, even though it is no longer in the working tree, because the
|
|
file globbing is used to match entries in the index (not in the
|
|
working tree by the shell).</p></div>
|
|
<div class="paragraph"><p>To restore all files in the current directory</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore .</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>or to restore all working tree files with <em>top</em> pathspec magic (see
|
|
<a href="gitglossary.html">gitglossary(7)</a>)</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore :/</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>To restore a file in the index to match the version in <code>HEAD</code> (this is
|
|
the same as using <a href="git-reset.html">git-reset(1)</a>)</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore --staged hello.c</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>or you can restore both the index and the working tree (this is the same
|
|
as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore --source=HEAD --staged --worktree hello.c</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>or the short form which is more practical but less readable:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git restore -s@ -SW hello.c</code></pre>
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
|
|
<a href="git-reset.html">git-reset(1)</a></p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_git">GIT</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="footnotes"><hr /></div>
|
|
<div id="footer">
|
|
<div id="footer-text">
|
|
Last updated
|
|
2025-08-18 02:18:23 CEST
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|