diff options
Diffstat (limited to 'man1/git-checkout.1')
| -rw-r--r-- | man1/git-checkout.1 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 9af08ef2c..2dfa3df75 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.1 @@ -2,12 +2,12 @@ .\" Title: git-checkout .\" 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\-CHECKOUT" "1" "2023\-09\-29" "Git 2\&.42\&.0\&.296\&.g493f46" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "2023\-10\-02" "Git 2\&.42\&.0\&.307\&.gd0e808" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -36,8 +36,10 @@ git-checkout \- Switch branches or restore working tree files \fIgit checkout\fR [\-q] [\-f] [\-m] \-\-detach [<branch>] \fIgit checkout\fR [\-q] [\-f] [\-m] [\-\-detach] <commit> \fIgit checkout\fR [\-q] [\-f] [\-m] [[\-b|\-B|\-\-orphan] <new\-branch>] [<start\-point>] -\fIgit checkout\fR [\-f|\-\-ours|\-\-theirs|\-m|\-\-conflict=<style>] [<tree\-ish>] [\-\-] <pathspec>\&... -\fIgit checkout\fR [\-f|\-\-ours|\-\-theirs|\-m|\-\-conflict=<style>] [<tree\-ish>] \-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul] +\fIgit checkout\fR [\-f] <tree\-ish> [\-\-] <pathspec>\&... +\fIgit checkout\fR [\-f] <tree\-ish> \-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul] +\fIgit checkout\fR [\-f|\-\-ours|\-\-theirs|\-m|\-\-conflict=<style>] [\-\-] <pathspec>\&... +\fIgit checkout\fR [\-f|\-\-ours|\-\-theirs|\-m|\-\-conflict=<style>] \-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul] \fIgit checkout\fR (\-p|\-\-patch) [<tree\-ish>] [\-\-] [<pathspec>\&...] .fi .sp @@ -358,7 +360,7 @@ When a merge conflict happens, the index entries for conflicting paths are left \fBgit rm\fR if the merge should result in deletion of the path)\&. .sp -When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths\&. +When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths\&. This option cannot be used when checking out paths from a tree\-ish\&. .sp When switching branches with \fB\-\-merge\fR, staged changes may be lost\&. |