From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 15 Jul 2013 08:56:07 GMT
Subject: Re: ANNOUNCE: git-imerge -- Incremental merge and rebase for git
Message-ID: <vpq61wcgq1k.fsf@anie.imag.fr>
In-Reply-To: <51E23827.6010601@alum.mit.edu>

Michael Haggerty <mhagger@alum.mit.edu> writes:

> I've alluded to this little project of mine on the mailing list before,
> but I've never really announced it properly.  So here we go...
>
> git-imerge [1] is an open-source tool that helps you perform difficult
> Git merges and rebases by allowing conflicts to be resolved
> incrementally.

Seems cool! :-)

Added to:

  https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#imerge

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/