From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/74204 Path: news.gmane.org!not-for-mail From: Sven Joachim Newsgroups: gmane.emacs.gnus.general Subject: Re: Merging ChangeLogs Date: Sun, 21 Nov 2010 09:12:56 +0100 Message-ID: <874obbm6wn.fsf@turtle.gmx.de> References: <87k58jqh6u.fsf@hati.baby-gnu.org> <87pqu6uqr7.fsf@hati.baby-gnu.org> <8762vxuifo.fsf@hati.baby-gnu.org> <87zkt9t2ul.fsf@hati.baby-gnu.org> <874obfyj5c.fsf@hati.baby-gnu.org> <8739qzq2a9.fsf_-_@turtle.gmx.de> <87bp5jm8i9.fsf@turtle.gmx.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1290327234 19503 80.91.229.12 (21 Nov 2010 08:13:54 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 21 Nov 2010 08:13:54 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M22569@lists.math.uh.edu Sun Nov 21 09:13:50 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PK53V-0008EV-7l for ding-account@gmane.org; Sun, 21 Nov 2010 09:13:49 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PK53I-0004Wu-6v; Sun, 21 Nov 2010 02:13:36 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PK53F-0004Wj-Mu for ding@lists.math.uh.edu; Sun, 21 Nov 2010 02:13:33 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PK53E-00043E-Gp for ding@lists.math.uh.edu; Sun, 21 Nov 2010 02:13:33 -0600 Original-Received: from mailout-de.gmx.net ([213.165.64.23] helo=mail.gmx.net) by quimby.gnus.org with smtp (Exim 3.36 #1 (Debian)) id 1PK53C-0005BH-00 for ; Sun, 21 Nov 2010 09:13:30 +0100 Original-Received: (qmail invoked by alias); 21 Nov 2010 08:12:57 -0000 Original-Received: from p54862E68.dip.t-dialin.net (EHLO turtle.gmx.de) [84.134.46.104] by mail.gmx.net (mp067) with SMTP; 21 Nov 2010 09:12:57 +0100 X-Authenticated: #28250155 X-Provags-ID: V01U2FsdGVkX1+cnq8tvAicSs/UmYiUODG+FLNn2TZ5iwGKdLlHrU RKoRrPOW3oLlD/ Original-Received: by turtle.gmx.de (Postfix, from userid 1000) id 994D63F422; Sun, 21 Nov 2010 09:12:56 +0100 (CET) Mail-Followup-To: ding@gnus.org In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sun, 21 Nov 2010 08:43:18 +0100") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.2.90 (gnu/linux) X-Y-GMX-Trusted: 0 X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:74204 Archived-At: On 2010-11-21 08:43 +0100, Lars Magne Ingebrigtsen wrote: > Sven Joachim writes: > >>> That looks very nice. But does this mean that everybody has to have the >>> merge driver installed? >> >> No, a custom merge driver is only tried if it is registered in >> .git/config or ~/.gitconfig. Otherwise, git uses the built-in merge >> driver. > > But if we put it in .git/config, then everybody has to have it, perhaps? No, .git/config is a private directory that is not shared between repositories. I.e. everyone has to enable the merge driver themselves, but that is completely optional. > But I guess we could just put the merge driver into git Gnus as well? > Er... would that work? Probably not unless you pull (large parts of) gnulib into Gnus. This is hardly desirable IMHO. Sven