From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/74200
Path: news.gmane.org!not-for-mail
From: Sven Joachim <svenjoac@gmx.de>
Newsgroups: gmane.emacs.gnus.general
Subject: Re: Merging ChangeLogs
Date: Sun, 21 Nov 2010 08:38:22 +0100
Message-ID: <87bp5jm8i9.fsf@turtle.gmx.de>
References: <87k58jqh6u.fsf@hati.baby-gnu.org>
	<87pqu6uqr7.fsf@hati.baby-gnu.org> <m3y68tuo33.fsf@quimbies.gnus.org>
	<8762vxuifo.fsf@hati.baby-gnu.org> <m3hbfhui7r.fsf@quimbies.gnus.org>
	<87zkt9t2ul.fsf@hati.baby-gnu.org> <b4maal8v1wu.fsf@jpl.org>
	<874obfyj5c.fsf@hati.baby-gnu.org> <m3ipzvq3ec.fsf@quimbies.gnus.org>
	<8739qzq2a9.fsf_-_@turtle.gmx.de> <m362vrz3cc.fsf@quimbies.gnus.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-Trace: dough.gmane.org 1290325171 13452 80.91.229.12 (21 Nov 2010 07:39:31 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sun, 21 Nov 2010 07:39:31 +0000 (UTC)
To: ding@gnus.org
Original-X-From: ding-owner+M22565@lists.math.uh.edu Sun Nov 21 08:39:27 2010
Return-path: <ding-owner+M22565@lists.math.uh.edu>
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 <ding-owner+M22565@lists.math.uh.edu>)
	id 1PK4WE-0000VE-Ew
	for ding-account@gmane.org; Sun, 21 Nov 2010 08:39:26 +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 <ding-owner+M22565@lists.math.uh.edu>)
	id 1PK4Vp-0004E1-It; Sun, 21 Nov 2010 01:39:01 -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 <postmaster@quimby.gnus.org>)
	id 1PK4Vn-0004Dr-97
	for ding@lists.math.uh.edu; Sun, 21 Nov 2010 01:38:59 -0600
Original-Received: from quimby.gnus.org ([80.91.231.51])
	by mx1.math.uh.edu with esmtp (Exim 4.72)
	(envelope-from <postmaster@quimby.gnus.org>)
	id 1PK4Vl-0003xP-9y
	for ding@lists.math.uh.edu; Sun, 21 Nov 2010 01:38:59 -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 1PK4Vk-0004kX-00
	for <ding@gnus.org>; Sun, 21 Nov 2010 08:38:56 +0100
Original-Received: (qmail invoked by alias); 21 Nov 2010 07:38:25 -0000
Original-Received: from p54862E68.dip.t-dialin.net (EHLO turtle.gmx.de) [84.134.46.104]
  by mail.gmx.net (mp009) with SMTP; 21 Nov 2010 08:38:25 +0100
X-Authenticated: #28250155
X-Provags-ID: V01U2FsdGVkX1/sVP9cxK/sUC4ZpYnOylt8ytz/LNxMK3q1SmAR1+
	mAWUhcL5erpw5z
Original-Received: by turtle.gmx.de (Postfix, from userid 1000)
	id AF7363F422; Sun, 21 Nov 2010 08:38:22 +0100 (CET)
Mail-Followup-To: ding@gnus.org
In-Reply-To: <m362vrz3cc.fsf@quimbies.gnus.org> (Lars Magne Ingebrigtsen's
	message of "Sun, 21 Nov 2010 05:51:31 +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: <ding.gnus.org>
Precedence: bulk
Xref: news.gmane.org gmane.emacs.gnus.general:74200
Archived-At: <http://permalink.gmane.org/gmane.emacs.gnus.general/74200>

On 2010-11-21 05:51 +0100, Lars Magne Ingebrigtsen wrote:

> Sven Joachim <svenjoac@gmx.de> writes:
>
>> The gnulib project has a special merge driver for ChangeLogs¹ that could
>> significantly improve this workflow. 
>
> 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.

Sven