From: Matthias Beyer <mail@beyermatthias.de>
To: unlisted-recipients:; (no To-header on input)
Cc: Matthias Beyer <mail@beyermatthias.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] Add note that conflict resolution is still performed
Date: Tue, 12 Jul 2022 16:04:50 +0200 [thread overview]
Message-ID: <20220712140450.1288726-1-mail@beyermatthias.de> (raw)
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
prev parent reply other threads:[~2022-07-12 14:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-02 7:30 cherry-pick with --no-rerere-autoupdate does still rerere? Matthias Beyer
2022-07-02 19:04 ` Junio C Hamano
2022-07-03 7:08 ` Matthias Beyer
2022-07-05 17:49 ` Junio C Hamano
2022-07-12 14:04 ` Matthias Beyer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220712140450.1288726-1-mail@beyermatthias.de \
--to=mail@beyermatthias.de \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).