diff options
Diffstat (limited to 'man1/git-restore.1')
| -rw-r--r-- | man1/git-restore.1 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/man1/git-restore.1 b/man1/git-restore.1 index f83c8b363..69fe1f99a 100644 --- a/man1/git-restore.1 +++ b/man1/git-restore.1 @@ -2,12 +2,12 @@ .\" Title: git-restore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-09-29 +.\" Date: 2023-10-02 .\" Manual: Git Manual -.\" Source: Git 2.42.0.296.g493f462273 +.\" Source: Git 2.42.0.307.gd0e8084c65 .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "2023\-09\-29" "Git 2\&.42\&.0\&.296\&.g493f46" "Git Manual" +.TH "GIT\-RESTORE" "1" "2023\-10\-02" "Git 2\&.42\&.0\&.307\&.gd0e808" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -109,7 +109,9 @@ is specified\&. This flag enables progress reporting even if not attached to a t .PP \-\-ours, \-\-theirs .RS 4 -When restoring files in the working tree from the index, use stage #2 (\fIours\fR) or #3 (\fItheirs\fR) for unmerged paths\&. +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 +\fB\-\-source\fR +option)\&. .sp Note that during \fBgit rebase\fR @@ -125,7 +127,9 @@ for details\&. .PP \-m, \-\-merge .RS 4 -When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths\&. +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 +\fB\-\-source\fR +option)\&. .RE .PP \-\-conflict=<style> |