On Sat, Nov 2, 2013 at 5:00 AM, John Keeping <j...@keeping.me.uk> wrote: > 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. >> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
