From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 14 Aug 2008 23:04:44 GMT
Subject: Re: [GSoC] What is status of Git's Google Summer of Code 2008 projects?
Message-ID: <alpine.DEB.1.00.0808150103430.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <200808140457.56464.jnareb@gmail.com>

Hi,

On Thu, 14 Aug 2008, Jakub Narebski wrote:

> 5. git-merge builtin (!!!)
> 
> Student: Miklos Vajna
> Mentor: Johannes Schindelin
> 
> In "What's cooking in git.git (topics)" Junio C Hamano wrote:
> 
>   It already is beginning to become clear what 1.6.0 will look like.
>   [...]
>   * git-merge will be rewritten in C.
> 
> Status: Done and merged in.
> Student retention: Most likely.

I could not put it better, IOW 'nuff said :-)

Ciao,
Dscho