[PATCH] Add note that conflict resolution is still performed
- From
- Matthias Beyer <mail@beyermatthias.de>
- Date
- Jul 12, 2022, 14:04 UTC
- Message-ID
- <20220712140450.1288726-1-mail@beyermatthias.de>
- In-Reply-To
- <xmqq4jzvla9x.fsf@gitster.g>
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 all together.
CC: Phillip Wood <phillip.wood@dunelm.org.uk> CC: Junio C Hamano <gitster@pobox.com> Signed-off-by: Matthias Beyer <mail@beyermatthias.de> --- Documentation/git-cherry-pick.txt | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 78dcc9171f..730a4590af 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -160,6 +160,8 @@ 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. + If `--no-rerere-autoupdate` is specified, the conflict resolution is + still performed, but the index is not updated. SEQUENCER SUBCOMMANDS ---------------------
-- 2.36.0