From: Junio C Hamano <gitster@pobox.com>
To: Matthias Beyer <mail@beyermatthias.de>
Cc: git@vger.kernel.org
Subject: Re: cherry-pick with --no-rerere-autoupdate does still rerere?
Date: Tue, 05 Jul 2022 10:49:46 -0700 [thread overview]
Message-ID: <xmqq4jzvla9x.fsf@gitster.g> (raw)
In-Reply-To: <1656831907.rjf3s99jhj.astroid@takeshi.none> (Matthias Beyer's message of "Sun, 03 Jul 2022 09:08:01 +0200")
Matthias Beyer <mail@beyermatthias.de> writes:
> Excerpts from Junio C Hamano's message of Juli 2, 2022 9:04 pm:
>> Matthias Beyer <mail@beyermatthias.de> writes:
>>
>>> I just experienced a `git cherry-pick <commit> --no-rerere-autoupdate` where the
>>> conflict still got automatically resolved from rerere.
>>
>> If I am not mistaken, this is totally expected. You told the
>> command "use rerere but do not blindly accept the replayed
>> resolution into the index".
>
> Ah! After over 10 years of using git, I still missed that ("update the index" in
> the manpage). I was thinking about "cherry pick this, but don't use rerere at
> all".
>
> Thanks for clearing up my confusion!
It is highly appreciated that you gave us an opportunity to
improving the documentation (or possibly something else) to avoid
getting other users into a similar misunderstanding.
A discussion, proposal, or a patch to improve docs and helps is
certainly welcome.
next prev parent reply other threads:[~2022-07-05 17:49 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 [this message]
2022-07-12 14:04 ` [PATCH] Add note that conflict resolution is still performed Matthias Beyer
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=xmqq4jzvla9x.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mail@beyermatthias.de \
/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).