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

git-rerere during git-rebase

From
IJIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date
Jul 20, 2006, 14:14 UTC
Message-ID
<Pine.LNX.4.58.0607201702010.3746@kivilampi-30.cs.helsinki.fi>
Hi,

I discovered that "git-am --resolved --3way" (in 1.3.1) and "git-rebase --continue" (in 1.4.2.rc1.ge7a0) do not correctly capture hand resolved files into .git/rr-cache. In worst case I got (with 1.3.1), afaict, the postimage was incorrect including also all patches successfully applied after the git-am --resolved --3way up to until the point where next conflict occurred. To circumvent this, I can use git-rerere directly but I remember that its manpage states that one should never have to do so. I'm I missing something or is this a problem in git-rebase (or possibly in git-am)?

-- 
 i.

ps. I'm not subscribed, so please cc me.
Message 1 of 1 in “git-rerere during git-rebase”
  1. Ilpo JärvinenJul 20, 2006

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.