Re: rebasing branch with reverted patches

From: Francis Moreau <francis.moro@gmail.com>
Date: Apr 19, 2011, 09:09 UTC
Message-ID: <BANLkTimbSes-B8zK2a2t1Jp1v+29HdNvqw@mail.gmail.com>
In-Reply-To: <4DAD4B0F.9030908@drmicha.warpmail.net>

On Tue, Apr 19, 2011 at 10:42 AM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 18 quoted lines

> 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).

Of course, but my point was to make this automatically...

-- 
Francis