Re: merge-recursive, was Re: What's in git.git

From: Jakub Narebski <jnareb@gmail.com>
Date: Oct 26, 2006, 09:47 UTC
Message-ID: <ehq06d$i44$1@sea.gmane.org>
In-Reply-To: <7vlkn3o1w1.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

Show 11 quoted lines

> Jakub Narebski <jnareb@gmail.com> writes:
> 
>> BTW. both Perl version and builtin shorlog have email->real name translation
>> table built in. In Perl script version it is in __DATA__ section, and we
>> could update it using Inline::Files module, in C version it was in table.
>> But in fact this list is project specific. Shouldn't we make it customizable
>> (::sigh::, yet another file in $GIT_DIR...).
> 
> It already reads from .mailmap which could be tracked as part of
> the sources (if it is project specific it would be better if it
> can be shared among members).

By the way, if I read code correctly, it read '.mailmap' from _current_ directory. Shouldn't it read qx(git-rev-parse --show-cdup)/.mailmap ?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git