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

What happened to having to recover from upstream rebase?

From
PSPhil Susi <phillsusi@gmail.com>
Date
May 11, 2015, 19:50 UTC
Message-ID
<555107F7.1040906@gmail.com>

So it used to be that when upstream rebased, you'd get an error when you tried to pull again and have to fix things up with some git reset or rebase hackery. Trying to demo this today I found that the pull *worked*, using an automatic recursive merge.

Am I crazy in thinking this used to error, and if not, when did it change?
Next: Johannes Schindelin
Message 1 of 3 in “What happened to having to recover from upstream rebase?”
  1. Phil SusiMay 11, 2015
  2. Johannes SchindelinMay 13, 2015
  3. Matthieu MoyMay 13, 2015

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.