Re: Rebasing merge commits

2014-03-19 Thread Max Kirillov
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 mas

Rebasing merge commits

2014-03-18 Thread Robert Dailey
What's the general recommendation on rebasing after creating a merge commit on my branch? I realize rebase has the -p option but it seems like it does a lot of complicated stuff, and it discourages interactive rebase with the option. My situation is simple: I have a topic1 branch that has a few co