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

rerere.autoupdate that wouldn't

From
Phil Hord <hordp@cisco.com>
Date
Mar 9, 2012, 22:34 UTC
Message-ID
<4F5A8580.1010807@cisco.com>

So now I have rerere.autoupdate=true (living on the edge!), and today I rebased a branch and git did a new thing: it added the automerged file to the index like I expected.

Then git did an unexpected thing. It told me the merge had failed and it asked me to clean it up. There were no other conflicts; just this one conflict that was already automerged and added to my index.

All I had to do was 'git rebase --continue' and off it went.

But I was hoping for more. I was hoping that rebase would continue on its own and quit bothering me with these triflings.

Is this what is supposed to happen? Should I look into adding 'rerere.autoContinue=true'?

Maybe instead, the sane thing would be to add 'rerere.autoTest=make test'. Then if rerere is so worried about messing up my rebase, he can take a moment to do a build test to comfort his conscience.

Phil
Next: Junio C Hamano
Message 1 of 3 in “rerere.autoupdate that wouldn't”
  1. Phil HordMar 9, 2012
  2. Junio C HamanoMar 9, 2012
  3. Phil HordMar 9, 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.