Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Nov 2, 2013, 11:18 UTC
Message-ID: <CAMP44s2pydOZOdHEzDOm+57LbiFr-QgAE_3Xk6QfpDULMAs9xQ@mail.gmail.com>
In-Reply-To: <20131102110028.GD24023@serenity.lan>

On Sat, Nov 2, 2013 at 5:00 AM, John Keeping <john@keeping.me.uk> wrote:

Show 5 quoted lines

> On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:
>> One feature that is missing from git-integration is the ability to
>> parse existing integration branches.
>
> Nice - I'd never thought of doing this.

I tried to provide all the functionality of todo:Reintegrate, or at least the important one.

Show 7 quoted lines

>> It also has support for "evil merges", so it should be perfectly
>> usable for git.git maintenance.
>
> By this, do you mean that you have an ability to squash a fixup into the
> merge?  If so, how do you handle this in the status display - I've had a
> WIP branch for a while but haven't come up with a satisfactory way of
> displaying the status of a fixup.

Yes, I did basically what you did, however, I skipped the status part. I think it's more important to be able to do these fixups, even if they don't show on the status.

And to be honest I don't care much about the status feature in general.

Cheers.

-- 
Felipe Contreras