Setup and Config
Getting and Creating Projects
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
- Command-line interface conventions
- Everyday Git
- 2.25.1 → 2.26.1 no changes
- 2.25.0 01/13/20
git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>… git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>…]
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.
The command can also be used to restore the content in the index with
--staged, or restore both the working tree and the index with
By default, the restore sources for working tree and the index are the
--source could be used to specify a
commit as the restore source.
See "Reset, restore and revert" in git for the differences between the three commands.
THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
- -s <tree>
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.
If not specified, the default restore source for the working tree is the index, and the default restore source for the index is
HEAD. When both
--sourcemust also be specified.
Interactively select hunks in the difference between the restore source and the restore location. See the “Interactive Mode” section of git-add to learn how to operate the
--patchcan accept no pathspec and will prompt to restore all modified paths.
Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying
--stagedwill only restore the index. Specifying both restores both.
Quiet, suppress feedback messages. Implies
Progress status is reported on the standard error stream by default when it is attached to a terminal, unless
--quietis specified. This flag enables progress reporting even if not attached to a terminal, regardless of
When restoring files in the working tree from the index, use stage #2 (ours) or #3 (theirs) for unmerged paths.
Note that during
git pull --rebase, ours and theirs may appear swapped. See the explanation of the same options in git-checkout for details.
When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths.
The same as
--mergeoption above, but changes the way the conflicting hunks are presented, overriding the
merge.conflictStyleconfiguration variable. Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents).
When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither
--conflictis specified. Unmerged paths on the working tree are left alone.
In sparse checkout mode, by default is to only update entries matched by
<pathspec>and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in
In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the
--sourcetree are removed, to make them match
<tree>exactly. The default is no-overlay mode.
Pathspec is passed in
<file>instead of commandline args. If
-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
core.quotePath(see git-config). See also
Only meaningful with
--pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes).
Do not interpret any more arguments as options.
Limits the paths affected by the operation.
For more details, see the pathspec entry in gitglossary.
The following sequence switches to the
master branch, reverts the
Makefile to two revisions back, deletes hello.c by mistake, and gets
it back from the index.
$ git switch master $ git restore --source master~2 Makefile (1) $ rm -f hello.c $ git restore hello.c (2)
take a file out of another commit
restore hello.c from the index
If you want to restore all C source files to match the version in the index, you can say
$ git restore '*.c'
Note the quotes around
*.c. The file
hello.c 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).
To restore all files in the current directory
$ git restore .
or to restore all working tree files with top pathspec magic (see gitglossary)
$ git restore :/
To restore a file in the index to match the version in
HEAD (this is
the same as using git-reset)
$ git restore --staged hello.c
or you can restore both the index and the working tree (this the same as using git-checkout)
$ git restore --source=HEAD --staged --worktree hello.c
or the short form which is more practical but less readable:
$ git restore -s@ -SW hello.c
Part of the git suite