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

Re: Rebasing merge commits

From
Max Kirillov <max@max630.net>
Date
Mar 19, 2014, 21:00 UTC
Message-ID
<20140319210029.GA6457@wheezy.local>
In-Reply-To
<CAHd499BFAmfDAjNr0RhCiy4vEBn2xJzCtTmwrB-U51qJryB+Dw@mail.gmail.com>
On Tue, Mar 18, 2014 at 01:11:06PM -0500, Robert Dailey wrote:
> What's the general recommendation on rebasing after
> creating a merge commit on my branch?

Basically, rebase does not do anything magic. It just cherry-picks commits over a custom revision. You could do it manually: reset to the master and then cherry-pick all your commits (or whichever you would like to pick) from the older topic1. git rebase --onto would be useful to make it a bit less manual it there are many commits and few merges.

I used to do it myself, but later I have made my own rebase which can somehow handle merges: https://github.com/max630/git-rebase2/ You could try it also.

-- 
Max
Previous: Robert Dailey
Message 2 of 2 in “Rebasing merge commits”
  1. Robert DaileyMar 18, 2014
  2. Max KirillovMar 19, 2014

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.