From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 26 Oct 2006 10:56:26 GMT
Subject: Re: merge-recursive, was Re: What's in git.git
Message-ID: <Pine.LNX.4.63.0610261252480.3286@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v7iyno0qk.fsf@assigned-by-dhcp.cox.net>

Hi,

On Thu, 26 Oct 2006, Junio C Hamano wrote:

> This is a prime demonstration that it makes more sense to keep script 
> version until we flush out configurability issues.

Okay, I agree.

BTW before somebody asks: No, I did _not_ implement the .mailmap 
functionality. But once things are flushed out with the configuration, and 
_if_ the builtin is not undesired, I will implement it.

Since Linux really is a special guest, maybe we'd want to integrate the 
dot3 thing in .mailmap, and override the Linux defaults _only_ if .mailmap 
exists. Thoughts?

Ciao,
Dscho