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

Re: Handling rebasing better

From
EEErik Cervin Edin <erik@cervined.in>
Date
Oct 19, 2022, 13:30 UTC
Message-ID
<CA+JQ7M-48KZmnqFYfWvNeoFTxFrQAndwEZf7uuMxOw9PZSHktg@mail.gmail.com>
In-Reply-To
<53a8b40f-1740-581f-e2df-709b13046ffc@iee.email>
On Thu, Sep 22, 2022, 1:34 PM <djvortex@gmx.com> wrote
>
> Perhaps git could even support the "reset-to-the-remote-history and then cherry-pick your new local commits" directly, to help the developer in this task (so that you don't need to write down any hashes and do all that manually). But even if this isn't really feasible, at least detecting the situation and the clearer messages would help enormously.
Are you aware of
  git pull --rebase
?
Previous: Philip OakleyNext: Erik Cervin Edin
Message 3 of 4 in “Handling rebasing better”
  1. djvortex@gmx.comSep 22, 2022
  2. Philip OakleyOct 19, 2022
  3. Erik Cervin EdinOct 19, 2022
  4. Erik Cervin EdinOct 26, 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.