From: Miklos Vajna <vmiklos@frugalware.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, Sam Vilain <sam@vilain.net>,
	Joshua Roys <roysjosh@gmail.com>,
	Sverre Rabbelier <alturin@gmail.com>,
	Sverre Rabbelier <sverre@rabbelier.nl>,
	David Symonds <dsymonds@gmail.com>,
	Lea Wiemann <LeWiemann@gmail.com>,
	John Hawley <warthog19@eaglescrag.net>,
	Marek Zawirski <marek.zawirski@gmail.com>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Stephan Beyer <s-beyer@gmx.net>,
	Christian Couder <chriscool@tuxfamily.org>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Junio Hamano <gitster@pobox.com>
Subject: Re: [GSoC] Git projects for Google Summer of Code 2008 final evaluation
Date: Fri, 5 Sep 2008 00:55:59 +0200	[thread overview]
Message-ID: <20080904225559.GP16514@genesis.frugalware.org> (raw)
In-Reply-To: <200809042315.58898.jnareb@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

On Thu, Sep 04, 2008 at 11:15:56PM +0200, Jakub Narebski <jnareb@gmail.com> wrote:
> 5. git-merge builtin
> 
> Student: Miklos Vajna
> Mentor: Johannes Schindelin

builtin-merge is merged. I did not have it in my proposal, but support
for custom merge strategies is also merged. Lately I was working on
a better merge-recursive API, that is mostly in next now.

Time did not permit, but I was about to rewrite merge-octopus,
merge-one-file and merge-resolve in C as well.

I hope I'll have time to do it later in my free time, but I can't
promise anything, being a fulltime student as well. ;-)

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

next prev parent reply	other threads:[~2008-09-04 22:57 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-04 21:15 [GSoC] Git projects for Google Summer of Code 2008 final evaluation Jakub Narebski
2008-09-04 22:10 ` Daniel Barkalow
2008-09-04 22:22 ` Joshua Roys
2008-09-04 22:36 ` Stephan Beyer
2008-09-04 22:44 ` Sverre Rabbelier
2008-09-04 22:55 ` Miklos Vajna [this message]
2008-09-04 23:04 ` Shawn O. Pearce
2008-09-08 17:46 ` Marek Zawirski
2008-09-09 14:52 ` Johannes Schindelin
2008-09-15 12:13 ` Jakub Narebski
2008-09-15 12:40   ` Johannes Schindelin
2008-09-15 14:08     ` Shawn O. Pearce

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=20080904225559.GP16514@genesis.frugalware.org \
    --to=vmiklos@frugalware.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=LeWiemann@gmail.com \
    --cc=alturin@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=chriscool@tuxfamily.org \
    --cc=dsymonds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=marek.zawirski@gmail.com \
    --cc=roysjosh@gmail.com \
    --cc=s-beyer@gmx.net \
    --cc=sam@vilain.net \
    --cc=spearce@spearce.org \
    --cc=sverre@rabbelier.nl \
    --cc=warthog19@eaglescrag.net \
    /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

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).