From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 76446 invoked by alias); 20 Mar 2018 23:03:57 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 76434 invoked by uid 89); 20 Mar 2018 23:03:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.4 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 Mar 2018 23:03:55 +0000 Received: from librem.wildebeest.org (deer0x01.wildebeest.org [172.31.17.131]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 56B01302BB23 for ; Wed, 21 Mar 2018 00:03:53 +0100 (CET) Received: by librem.wildebeest.org (Postfix, from userid 1000) id 12EA814064F; Wed, 21 Mar 2018 00:03:53 +0100 (CET) Date: Tue, 20 Mar 2018 23:03:00 -0000 From: Mark Wielaard To: elfutils-devel@sourceware.org Subject: Re: [PATCH] Specify a custom git merge driver for ChangeLog files Message-ID: <20180320230353.GF6269@wildebeest.org> References: <20180319183335.GA23327@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180319183335.GA23327@altlinux.org> User-Agent: Mutt/1.9.3 (2018-01-21) X-Spam-Flag: NO X-IsSubscribed: yes X-SW-Source: 2018-q1/txt/msg00087.txt.bz2 I am not against this, but it could use a bit more documentation in at least the commit message, so people know what they should setup in their gitconfig. Also isn't it better to have something like the following in your local ~/.gitconfig: [core] attributesfile = ~/.gitattributes And then have the ChangeLog merge=merge-changelog line in ~/.gitattributes? Cheers, Mark