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

Re: [PATCH] rebase -i -p: use rerere to resolve conflicts if enabled

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 15, 2012, 15:52 UTC
Message-ID
<7vwr38bmj5.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1339769855-94161-1-git-send-email-ddkilzer@kilzer.net>
"David D. Kilzer" <ddkilzer@kilzer.net> writes:
Show 5 quoted lines
> From: "David D. Kilzer" <ddkilzer@kilzer.net>
>
> When performing an interactive rebase that preserves merges with
> rerere enabled, the --rerere-autoupdate switch should be passed
> to git-merge.
I do not understand the above reasoning.

"rerere" is enabled in "merge" used in this codepath already, so after it runs, you will see the result of automatically replaying a previous resolution without your patch.

The configuration rerere.enabled *never* meant that the user blindly trusts the result of replaying a previous resolution. If you were checking rerere.autoupdate configuration variable, the patch may have made some sense, but basing the decision on rerere.enabled (which by the way is not necessary to trigger the rerere machinery these days, as long as $GIT_DIR/rr-cache/ directory exists) sounds very wrong.

Previous: David D. KilzerNext: David Kilzer
Message 2 of 12 in “rebase -i -p: use rerere to resolve conflicts if enabled”
  1. rebase -i -p: use rerere to resolve conflicts if enabledDavid D. Kilzer, Jun 15, 2012
  2. Junio C HamanoJun 15, 2012
  3. David KilzerJun 16, 2012
  4. Junio C HamanoJun 16, 2012
  5. David KilzerJun 17, 2012
  6. Junio C HamanoJun 17, 2012
  7. David KilzerJun 17, 2012
  8. Johannes SixtJun 17, 2012
  9. David KilzerJun 17, 2012
  10. Johannes SixtJun 18, 2012
  11. Junio C HamanoJun 17, 2012
  12. Junio C HamanoJun 17, 2012

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.