We should note that conflict resolution is still performed, even if `--no-rerere-autoupdate` is specified, to make sure users do not get confused by the setting and assume this disables rerere conflict resultion altogether. CC: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> CC: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Matthias Beyer <mail@xxxxxxxxxxxxxxxx> --- Documentation/git-cherry-pick.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 78dcc9171f..b92aa1f9da 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -160,6 +160,10 @@ effect to your index in a row. --no-rerere-autoupdate:: Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. + The `--no-rerere-autoupdate` option does not prevent the conflict + resolution, but prevents the index from being updated. This gives the + user a chance for a final sanity check before using linkgit:git-add[1] + to add the result. SEQUENCER SUBCOMMANDS --------------------- -- 2.36.0
