From: Francis Moreau <francis.moro@gmail.com>
Date: Tue, 19 Apr 2011 10:21:45 GMT
Subject: Re: rebasing branch with reverted patches
Message-ID: <BANLkTim9vKpp6=AwSG9pkWZrw9YKCuFS9w@mail.gmail.com>
In-Reply-To: <BANLkTim_QNFhChme=nxGf1_Dw8LedTS3Ag@mail.gmail.com>

Hello,

On Tue, Apr 19, 2011 at 11:39 AM, Santi Béjar <santi@agolina.net> wrote:
>
> You can also change the A' commit title to "fixup! original_title"
> while reverting (there is no --fixup argument like "git commit" has),
> then git rebase -i would reorder the todo file for you.

Interesting I wasn't aware of --autosquash option, thanks.

This is almost what I was asking for actually, the only part which is
missing is the fact that git-rebase detect the "Revert: " magic
string, check that the revert is sane (by comparing the diff of the
revert with the diff of the original commit) and do the same as
"fixup!" would do without the confusion of the resulting empty commit.

Thanks
-- 
Francis