From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: git discussion list <git@vger.kernel.org>
Subject: Re: ANNOUNCE: git-imerge -- Incremental merge and rebase for git
Date: Mon, 15 Jul 2013 10:56:07 +0200 [thread overview]
Message-ID: <vpq61wcgq1k.fsf@anie.imag.fr> (raw)
In-Reply-To: <51E23827.6010601@alum.mit.edu> (Michael Haggerty's message of "Sun, 14 Jul 2013 07:33:27 +0200")
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/
prev parent reply other threads:[~2013-07-15 8:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 5:33 ANNOUNCE: git-imerge -- Incremental merge and rebase for git Michael Haggerty
2013-07-15 8:56 ` Matthieu Moy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq61wcgq1k.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).