git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: cherry-pick with --no-rerere-autoupdate does still rerere?

From
MBMatthias Beyer <mail@beyermatthias.de>
Date
Jul 3, 2022, 07:08 UTC
Message-ID
<1656831907.rjf3s99jhj.astroid@takeshi.none>
In-Reply-To
<xmqqwncv49qm.fsf@gitster.g>
Excerpts from Junio C Hamano's message of Juli 2, 2022 9:04 pm:
Show 8 quoted lines
> 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! Matthias

-- 
Mit freundlichen Grüßen,
Kind regards,
Matthias Beyer
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 5 in “cherry-pick with --no-rerere-autoupdate does still rerere?”
  1. Matthias BeyerJul 2, 2022
  2. Junio C HamanoJul 2, 2022
  3. Matthias BeyerJul 3, 2022
  4. Junio C HamanoJul 5, 2022
  5. Add note that conflict resolution is still performedMatthias Beyer, Jul 12, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.