diff options
Diffstat (limited to 'man1/git-cherry-pick.1')
| -rw-r--r-- | man1/git-cherry-pick.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index c13e6bf44..32d27a86a 100644 --- a/man1/git-cherry-pick.1 +++ b/man1/git-cherry-pick.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry-pick .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/20/2023 +.\" Date: 01/21/2023 .\" Manual: Git Manual -.\" Source: Git 2.39.1.254.g904d404274 +.\" Source: Git 2.39.1.308.g56c8fb1e95 .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "01/20/2023" "Git 2\&.39\&.1\&.254\&.g904d40" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "01/21/2023" "Git 2\&.39\&.1\&.308\&.g56c8fb" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -311,7 +311,7 @@ The following sequence attempts to backport a patch, bails out because the code .nf $ git cherry\-pick topic^ \fB(1)\fR $ git diff \fB(2)\fR -$ git reset \-\-merge ORIG_HEAD \fB(3)\fR +$ git cherry\-pick \-\-abort \fB(3)\fR $ git cherry\-pick \-Xpatience topic^ \fB(4)\fR .fi .if n \{\ |