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

Re: rebasing a merge

From
Peter Krefting <peter@softwolves.pp.se>
Date
Jun 18, 2010, 09:10 UTC
Message-ID
<alpine.DEB.2.00.1006181010220.12445@ds9.cixit.se>
In-Reply-To
<AANLkTilY_9j2sXlplhYB4FPAIAzuPBg2UyUTEk4DaaYF@mail.gmail.com>
Jay Soffian:
> Here's how I've been doing it, but I'll bet there's a less convoluted way:

Do you have git-rerere enabled? I have found that to be a major timesaver for cases like these.

-- 
\\// Peter - http://www.softwolves.pp.se/
Previous: Jay SoffianNext: Jay Soffian
Message 3 of 6 in “rebasing a merge”
  1. Jay SoffianJun 17, 2010
  2. Jay SoffianJun 18, 2010
  3. Peter KreftingJun 18, 2010
  4. Jay SoffianJun 18, 2010
  5. Peter KreftingJun 24, 2010
  6. Jay SoffianJun 24, 2010

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.