git-restore
git-restore
Name
git-restore - Restore working tree files
Synopsis
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>…]
Description
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 --staged --worktree
.
By default, if --staged
is given, the contents are restored from HEAD
, otherwise from the index. Use --source
to restore from a different commit.
See "Reset, restore and revert" in git[1] for the differences between the three commands.
THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
Options
-s --source= 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 contents are restored from HEAD
if --staged
is given, otherwise from the index.
As a special case, you may use "A...B"
as a shortcut for the merge base of A
and B
if there is exactly one merge base. You can leave out at most one of A
and B
, in which case it defaults to HEAD
.
-p
--patch
Interactively select hunks in the difference between the restore source and the restore location. See the “Interactive Mode” section of git-add[1] to learn how to operate the --patch
mode.
Note that --patch
can accept no pathspec and will prompt to restore all modified paths.
-W
--worktree
-S
--staged
Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying --staged
will only restore the index. Specifying both restores both.
-q
--quiet
Quiet, suppress feedback messages. Implies --no-progress
.
--progress
--no-progress
Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet
is specified. This flag enables progress reporting even if not attached to a terminal, regardless of --quiet
.
--ours
--theirs
When restoring files in the working tree from the index, use stage #2 (ours
) or #3 (theirs
) for unmerged paths.
Note that during git rebase
and git pull --rebase
, ours
and theirs
may appear swapped. See the explanation of the same options in git-checkout[1] for details.
-m --merge When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths.
--conflict=