From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Wed, 24 Nov 2010 06:53:49 GMT
Subject: Re: [PATCH] rebase -m: skip cherry-picked commits more reliably
Message-ID: <alpine.DEB.1.10.1011240746030.17721@debian>
In-Reply-To: <alpine.DEB.1.10.1011232156510.17721@debian>



On Tue, 23 Nov 2010, Martin von Zweigbergk wrote:

> What I think we really want to do is to remove any patches in
> upstream..branch that also exist in branch..onto. I don't know how to
> do that efficiently, though. (And am I even right about it?)

To try to answer my own question, would the lines prefixed with a plus
in the output of 'git cherry $onto $branch $(git merge-base $upstream
$branch)' work?

/Martin