| blob | 41148298fd4378dc5edd3d4deed174548f5f1665 |
1 '\" t
2 .\" Title: git-restore
3 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
4 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
5 .\" Date: 2024-02-15
6 .\" Manual: Git Manual
7 .\" Source: Git 2.44.0.rc1.17.g3e0d3cd5c7
8 .\" Language: English
9 .\"
10 .TH "GIT\-RESTORE" "1" "2024\-02\-15" "Git 2\&.44\&.0\&.rc1\&.17\&.g3" "Git Manual"
11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff
13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq '
20 .\" -----------------------------------------------------------------
21 .\" * set default formatting
22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation
24 .nh
25 .\" disable justification (adjust text to left margin only)
26 .ad l
27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE *
29 .\" -----------------------------------------------------------------
30 .SH "NAME"
31 git-restore \- Restore working tree files
32 .SH "SYNOPSIS"
33 .sp
34 .nf
35 \fIgit restore\fR [<options>] [\-\-source=<tree>] [\-\-staged] [\-\-worktree] [\-\-] <pathspec>\&...
36 \fIgit restore\fR [<options>] [\-\-source=<tree>] [\-\-staged] [\-\-worktree] \-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul]
37 \fIgit restore\fR (\-p|\-\-patch) [<options>] [\-\-source=<tree>] [\-\-staged] [\-\-worktree] [\-\-] [<pathspec>\&...]
38 .fi
39 .sp
40 .SH "DESCRIPTION"
41 .sp
42 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\&.
43 .sp
44 The command can also be used to restore the content in the index with \fB\-\-staged\fR, or restore both the working tree and the index with \fB\-\-staged \-\-worktree\fR\&.
45 .sp
46 By default, if \fB\-\-staged\fR is given, the contents are restored from \fBHEAD\fR, otherwise from the index\&. Use \fB\-\-source\fR to restore from a different commit\&.
47 .sp
48 See "Reset, restore and revert" in \fBgit\fR(1) for the differences between the three commands\&.
49 .sp
50 THIS COMMAND IS EXPERIMENTAL\&. THE BEHAVIOR MAY CHANGE\&.
51 .SH "OPTIONS"
52 .PP
53 \-s <tree>, \-\-source=<tree>
54 .RS 4
55 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\&.
56 .sp
57 If not specified, the contents are restored from
58 \fBHEAD\fR
59 if
60 \fB\-\-staged\fR
61 is given, otherwise from the index\&.
62 .sp
63 As a special case, you may use
64 \fB"A\&.\&.\&.B"\fR
65 as a shortcut for the merge base of
66 \fBA\fR
67 and
68 \fBB\fR
69 if there is exactly one merge base\&. You can leave out at most one of
70 \fBA\fR
71 and
72 \fBB\fR, in which case it defaults to
73 \fBHEAD\fR\&.
74 .RE
75 .PP
76 \-p, \-\-patch
77 .RS 4
78 Interactively select hunks in the difference between the restore source and the restore location\&. See the \(lqInteractive Mode\(rq section of
79 \fBgit-add\fR(1)
80 to learn how to operate the
81 \fB\-\-patch\fR
82 mode\&.
83 .sp
84 Note that
85 \fB\-\-patch\fR
86 can accept no pathspec and will prompt to restore all modified paths\&.
87 .RE
88 .PP
89 \-W, \-\-worktree, \-S, \-\-staged
90 .RS 4
91 Specify the restore location\&. If neither option is specified, by default the working tree is restored\&. Specifying
92 \fB\-\-staged\fR
93 will only restore the index\&. Specifying both restores both\&.
94 .RE
95 .PP
96 \-q, \-\-quiet
97 .RS 4
98 Quiet, suppress feedback messages\&. Implies
99 \fB\-\-no\-progress\fR\&.
100 .RE
101 .PP
102 \-\-progress, \-\-no\-progress
103 .RS 4
104 Progress status is reported on the standard error stream by default when it is attached to a terminal, unless
105 \fB\-\-quiet\fR
106 is specified\&. This flag enables progress reporting even if not attached to a terminal, regardless of
107 \fB\-\-quiet\fR\&.
108 .RE
109 .PP
110 \-\-ours, \-\-theirs
111 .RS 4
112 When restoring files in the working tree from the index, use stage #2 (\fIours\fR) or #3 (\fItheirs\fR) for unmerged paths\&. This option cannot be used when checking out paths from a tree\-ish (i\&.e\&. with the
113 \fB\-\-source\fR
114 option)\&.
115 .sp
116 Note that during
117 \fBgit rebase\fR
118 and
119 \fBgit pull \-\-rebase\fR,
120 \fIours\fR
121 and
122 \fItheirs\fR
123 may appear swapped\&. See the explanation of the same options in
124 \fBgit-checkout\fR(1)
125 for details\&.
126 .RE
127 .PP
128 \-m, \-\-merge
129 .RS 4
130 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
131 \fB\-\-source\fR
132 option)\&.
133 .RE
134 .PP
135 \-\-conflict=<style>
136 .RS 4
137 The same as
138 \fB\-\-merge\fR
139 option above, but changes the way the conflicting hunks are presented, overriding the
140 \fBmerge\&.conflictStyle\fR
141 configuration variable\&. Possible values are "merge" (default), "diff3", and "zdiff3"\&.
142 .RE
143 .PP
144 \-\-ignore\-unmerged
145 .RS 4
146 When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither
147 \fB\-\-ours\fR,
148 \fB\-\-theirs\fR,
149 \fB\-\-merge\fR
150 or
151 \fB\-\-conflict\fR
152 is specified\&. Unmerged paths on the working tree are left alone\&.
153 .RE
154 .PP
155 \-\-ignore\-skip\-worktree\-bits
156 .RS 4
157 In sparse checkout mode, the default is to only update entries matched by
158 \fB<pathspec>\fR
159 and sparse patterns in $GIT_DIR/info/sparse\-checkout\&. This option ignores the sparse patterns and unconditionally restores any files in
160 \fB<pathspec>\fR\&.
161 .RE
162 .PP
163 \-\-recurse\-submodules, \-\-no\-recurse\-submodules
164 .RS 4
165 If
166 \fB<pathspec>\fR
167 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
168 \fB\-\-no\-recurse\-submodules\fR) is used, submodules working trees will not be updated\&. Just like
169 \fBgit-checkout\fR(1), this will detach
170 \fBHEAD\fR
171 of the submodule\&.
172 .RE
173 .PP
174 \-\-overlay, \-\-no\-overlay
175 .RS 4
176 In overlay mode, the command never removes files when restoring\&. In no\-overlay mode, tracked files that do not appear in the
177 \fB\-\-source\fR
178 tree are removed, to make them match
179 \fB<tree>\fR
180 exactly\&. The default is no\-overlay mode\&.
181 .RE
182 .PP
183 \-\-pathspec\-from\-file=<file>
184 .RS 4
185 Pathspec is passed in
186 \fB<file>\fR
187 instead of commandline args\&. If
188 \fB<file>\fR
189 is exactly
190 \fB\-\fR
191 then standard input is used\&. Pathspec elements are separated by LF or CR/LF\&. Pathspec elements can be quoted as explained for the configuration variable
192 \fBcore\&.quotePath\fR
193 (see
194 \fBgit-config\fR(1))\&. See also
195 \fB\-\-pathspec\-file\-nul\fR
196 and global
197 \fB\-\-literal\-pathspecs\fR\&.
198 .RE
199 .PP
200 \-\-pathspec\-file\-nul
201 .RS 4
202 Only meaningful with
203 \fB\-\-pathspec\-from\-file\fR\&. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)\&.
204 .RE
205 .PP
206 \-\-
207 .RS 4
208 Do not interpret any more arguments as options\&.
209 .RE
210 .PP
211 <pathspec>\&...
212 .RS 4
213 Limits the paths affected by the operation\&.
214 .sp
215 For more details, see the
216 \fIpathspec\fR
217 entry in
218 \fBgitglossary\fR(7)\&.
219 .RE
220 .SH "EXAMPLES"
221 .sp
222 The following sequence switches to the \fBmaster\fR branch, reverts the \fBMakefile\fR to two revisions back, deletes hello\&.c by mistake, and gets it back from the index\&.
223 .sp
224 .if n \{\
225 .RS 4
226 .\}
227 .nf
228 $ git switch master
229 $ git restore \-\-source master~2 Makefile \fB(1)\fR
230 $ rm \-f hello\&.c
231 $ git restore hello\&.c \fB(2)\fR
232 .fi
233 .if n \{\
234 .RE
235 .\}
236 .sp
237 .TS
238 tab(:);
239 r lw(\n(.lu*75u/100u).
240 \fB1.\fR\h'-2n':T{
241 take a file out of another commit
242 T}
243 \fB2.\fR\h'-2n':T{
244 restore hello\&.c from the index
245 T}
246 .TE
247 .sp
248 If you want to restore \fIall\fR C source files to match the version in the index, you can say
249 .sp
250 .if n \{\
251 .RS 4
252 .\}
253 .nf
254 $ git restore \*(Aq*\&.c\*(Aq
255 .fi
256 .if n \{\
257 .RE
258 .\}
259 .sp
260 .sp
261 Note the quotes around \fB*\&.c\fR\&. The file \fBhello\&.c\fR 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)\&.
262 .sp
263 To restore all files in the current directory
264 .sp
265 .if n \{\
266 .RS 4
267 .\}
268 .nf
269 $ git restore \&.
270 .fi
271 .if n \{\
272 .RE
273 .\}
274 .sp
275 .sp
276 or to restore all working tree files with \fItop\fR pathspec magic (see \fBgitglossary\fR(7))
277 .sp
278 .if n \{\
279 .RS 4
280 .\}
281 .nf
282 $ git restore :/
283 .fi
284 .if n \{\
285 .RE
286 .\}
287 .sp
288 .sp
289 To restore a file in the index to match the version in \fBHEAD\fR (this is the same as using \fBgit-reset\fR(1))
290 .sp
291 .if n \{\
292 .RS 4
293 .\}
294 .nf
295 $ git restore \-\-staged hello\&.c
296 .fi
297 .if n \{\
298 .RE
299 .\}
300 .sp
301 .sp
302 or you can restore both the index and the working tree (this is the same as using \fBgit-checkout\fR(1))
303 .sp
304 .if n \{\
305 .RS 4
306 .\}
307 .nf
308 $ git restore \-\-source=HEAD \-\-staged \-\-worktree hello\&.c
309 .fi
310 .if n \{\
311 .RE
312 .\}
313 .sp
314 .sp
315 or the short form which is more practical but less readable:
316 .sp
317 .if n \{\
318 .RS 4
319 .\}
320 .nf
321 $ git restore \-s@ \-SW hello\&.c
322 .fi
323 .if n \{\
324 .RE
325 .\}
326 .sp
327 .SH "SEE ALSO"
328 .sp
329 \fBgit-checkout\fR(1), \fBgit-reset\fR(1)
330 .SH "GIT"
331 .sp
332 Part of the \fBgit\fR(1) suite