From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: Re: merge-recursive, was Re: What's in git.git Date: Thu, 26 Oct 2006 11:47:34 +0200 Organization: At home Message-ID: References: <7vk62npipb.fsf@assigned-by-dhcp.cox.net> <7vlkn3o1w1.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit NNTP-Posting-Date: Thu, 26 Oct 2006 09:47:49 +0000 (UTC) Return-path: Envelope-to: gcvg-git@gmane.org X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-23-110.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gd1pl-00054U-9B for gcvg-git@gmane.org; Thu, 26 Oct 2006 11:47:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423026AbWJZJr3 (ORCPT ); Thu, 26 Oct 2006 05:47:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423034AbWJZJr3 (ORCPT ); Thu, 26 Oct 2006 05:47:29 -0400 Received: from main.gmane.org ([80.91.229.2]:42630 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S1423026AbWJZJr2 (ORCPT ); Thu, 26 Oct 2006 05:47:28 -0400 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Gd1pY-00050d-1A for git@vger.kernel.org; Thu, 26 Oct 2006 11:47:20 +0200 Received: from host-81-190-23-110.torun.mm.pl ([81.190.23.110]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Oct 2006 11:47:20 +0200 Received: from jnareb by host-81-190-23-110.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 Oct 2006 11:47:20 +0200 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Junio C Hamano wrote: > Jakub Narebski 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