From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 19 Apr 2011 08:42:55 GMT
Subject: Re: rebasing branch with reverted patches
Message-ID: <4DAD4B0F.9030908@drmicha.warpmail.net>
In-Reply-To: <BANLkTim5mf6okFN8V5V+B=Ns1JORD47a5A@mail.gmail.com>

Francis Moreau venit, vidit, dixit 19.04.2011 09:32:
> Hello,
> 
> I'm wondering if it would be a good idea for git rebase to allow not
> rebasing reverted patch which are part of the rebased branch.
> 
> For example I'm currently rebasing my branch 'devel' onto master. This
> branch have several commits and specially one called A and another one
> called A' which reverts A.
> 
> When rebasing 'devel' branch, rebase could try to drop both A and A'.
> 
> What do you think ?
> 
> BTW is there a way to do this currently ?

You can do this with "rebase -i" by removing A and A' from the commit
list (or squashing them or dealing with them in whatever way you like).

Michael