diff options
Diffstat (limited to 'man1/git-cherry-pick.1')
| -rw-r--r-- | man1/git-cherry-pick.1 | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index c2b06846f..71e40c877 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: 2023-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -318,18 +318,25 @@ $ git cherry\-pick \-Xpatience topic^ \fB(4)\fR .RE .\} .sp -.sp -\fB1. \fRapply the change that would be shown by +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +apply the change that would be shown by \fBgit show topic^\fR\&. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results\&. -.br -\fB2. \fRsummarize changes to be reconciled -.br -\fB3. \fRcancel the cherry\-pick\&. In other words, return to the pre\-cherry\-pick state, preserving any local modifications you had in the working tree\&. -.br -\fB4. \fRtry to apply the change introduced by +T} +\fB2.\fR\h'-2n':T{ +summarize changes to be reconciled +T} +\fB3.\fR\h'-2n':T{ +cancel the cherry\-pick\&. In other words, return to the pre\-cherry\-pick state, preserving any local modifications you had in the working tree\&. +T} +\fB4.\fR\h'-2n':T{ +try to apply the change introduced by \fBtopic^\fR again, spending extra time to avoid mistakes based on incorrectly matching context lines\&. -.br +T} +.TE .SH "SEE ALSO" .sp \fBgit-revert\fR(1) |