From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 62044 invoked by alias); 20 Mar 2018 23:42:05 -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 62033 invoked by uid 89); 20 Mar 2018 23:42:05 -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=-2.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-2.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS,T_RP_MATCHES_RCVD 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: vmicros1.altlinux.org Received: from vmicros1.altlinux.org (HELO vmicros1.altlinux.org) (194.107.17.57) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 Mar 2018 23:42:04 +0000 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 077D672D564 for ; Wed, 21 Mar 2018 02:42:02 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id EAB937CC76C; Wed, 21 Mar 2018 02:42:01 +0300 (MSK) Date: Tue, 20 Mar 2018 23:42:00 -0000 From: "Dmitry V. Levin" To: elfutils-devel@sourceware.org Subject: Re: [PATCH] Specify a custom git merge driver for ChangeLog files Message-ID: <20180320234201.GA12595@altlinux.org> Mail-Followup-To: elfutils-devel@sourceware.org References: <20180319183335.GA23327@altlinux.org> <20180320230353.GF6269@wildebeest.org> <20180320232051.GA12453@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline In-Reply-To: <20180320232051.GA12453@altlinux.org> X-IsSubscribed: yes X-SW-Source: 2018-q1/txt/msg00090.txt.bz2 --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 620 On Wed, Mar 21, 2018 at 02:20:51AM +0300, Dmitry V. Levin wrote: > On Wed, Mar 21, 2018 at 12:03:53AM +0100, Mark Wielaard wrote: > > 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. >=20 > The advantage of adding .gitattributes file to repository is that > no gitconfig setup is needed at all, just git-merge-changelog > has to be made available in $PATH. My bad, gitconfig setup cannot be avoided this way. Being an early adopter of git-merge-changelog, I must have forgotten these details. --=20 ldv --MGYHOYXEY6WxJCY8 Content-Type: application/pgp-signature; name="signature.asc" Content-length: 801 -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJasZxJAAoJEAVFT+BVnCUINP0QAOJgQhlD+D/bRlloyuiq7EDL ZKFMr2unNCMyQ4erIW+MPO44YsnRWCxkCr7y8pYn+Zmi+V3hGsjfWdn63snc3WCS bCwpzHDcsAShcjDdoI0Wq14NFVtQG07ooMAfHVgsLpuC3S+Xf7elTEdKpuz+HhSb O/LnotCbRemmOKrZJBXUy9a1Y9vWpcIO5u+Z9i1gSkLO7eRp9lHGJ945j6mWNOId kjnIiyksLioOlN5VFTClmUaLFRyuxLlDkuI5WpL07ycKk+yOfLNQS8YxLwkU3d4V 5RpU8YPq7o64M3zQHXtzmToS6FaGZKXFAAoPCHvRMCyp7J+CoUdd7C+u5Ox0nxnh rI9Ok9bV+/cyF7GZCmW4dv3eE305LBLbjExbcj5SgnTP2pmHx4A9YOwStamv35QQ 94JgZk7Rd1PZTZUeopoU0XXUuISzrNk6I0DxB8eQklCG4ufoS+FwTV24CRH/bTer uYqYQOwzYzlBihSS4YR8+nzwtYcWgZy59SLYylWUl+J0EZLbfcOZ/sCAUQggP6lR MOg1/iin3wV9pWAEzcFjrO6k5Ij67NPSAVdIVfN3V3GFGdIVTwa8XY1Vw46/B4Um PAgLn+qyoc5Qaa6gtS612M9WoF1tWt1KKbXNj+fQQ1y7HfIRKlAIR9ng0uLfMZHx Xqz7RKqNS/45pnkX7XWv =MJbe -----END PGP SIGNATURE----- --MGYHOYXEY6WxJCY8--