Subject: Re: Rebasing merge commits

From: Max Kirillov <[email-masked]>
Date: Wed, 19 Mar 2014 23:00:29 +0200

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