diff options
Diffstat (limited to 'man1/git-cherry-pick.1')
| -rw-r--r-- | man1/git-cherry-pick.1 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 511ad4bd2..b8d12559f 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: 08/12/2022 +.\" Date: 08/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.2.324.gafa70145a2 +.\" Source: Git 2.37.2.382.g795ea8776b .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "08/12/2022" "Git 2\&.37\&.2\&.324\&.gafa701" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "08/18/2022" "Git 2\&.37\&.2\&.382\&.g795ea8" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -229,7 +229,12 @@ for details\&. .PP \-\-rerere\-autoupdate, \-\-no\-rerere\-autoupdate .RS 4 -Allow the rerere mechanism to update the index with the result of auto\-conflict resolution if possible\&. +After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution\&. +\fB\-\-no\-rerere\-autoupdate\fR +is a good way to double\-check what +\fBrerere\fR +did and catch potential mismerges, before committing the result to the index with a separate +\fBgit add\fR\&. .RE .SH "SEQUENCER SUBCOMMANDS" .PP |