From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48649 invoked by alias); 20 Mar 2018 23:20:56 -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 48632 invoked by uid 89); 20 Mar 2018 23:20:55 -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:20:54 +0000 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 9E35A72D564 for ; Wed, 21 Mar 2018 02:20:51 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 848B27CC76C; Wed, 21 Mar 2018 02:20:51 +0300 (MSK) Date: Tue, 20 Mar 2018 23:20: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: <20180320232051.GA12453@altlinux.org> Mail-Followup-To: elfutils-devel@sourceware.org References: <20180319183335.GA23327@altlinux.org> <20180320230353.GF6269@wildebeest.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IS0zKkzwUGydFO0o" Content-Disposition: inline In-Reply-To: <20180320230353.GF6269@wildebeest.org> X-IsSubscribed: yes X-SW-Source: 2018-q1/txt/msg00088.txt.bz2 --IS0zKkzwUGydFO0o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 400 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. 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. --=20 ldv --IS0zKkzwUGydFO0o Content-Type: application/pgp-signature; name="signature.asc" Content-length: 801 -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJasZdTAAoJEAVFT+BVnCUIrwIP/iYY+oDVBqnNYYHwh9bRaUbQ TlhcQ/QsSjFyHlHSNrb+D9XeiyNZd5gKrvcHQuY8ZnhNElwiQ3C+N9yY4wI43aHI 3/oE9EUmy57LPE8ky4Q2+Lx/eBKg5fVdP0jbb8JuvNcHVppUzwNsWV677WojAVtk 1by5BAtwracpnx/HeHcmjuq29H9fHgiEd0g8uTuGzzOwT93eMW+Qjz3Mn7qladzQ kHYvk42wx1w+3ZaPQLw3k8w/9ynzkzXJ1fofd+ASkk5A/UbYjujcintE/NAU0lID r/+032JG8GPZq0LYEF/k+43zUBURxcSKrOFBt6oh8OJZkx5Fm+0vcAdH2ps2wWWR Lx5ZCio+PTVtgK05Pj5BNzZDeTKbTv9wjH8KGOQuMQkJB+PqFsaq4ePTVgn3h4fw 1JRKaH4Sa9iXXY9VgtbvH1+HaKp/b7bWkhDuHrjtdCigce9pL9MNgHy5NXhpUfgq FMg18/HXyJTp7MIqFU3ZUBKVsGnwFYPNeVaEmWXqI9L0twe+a/XGKCNYR+sRlcFN LbX55qTYDd8z/bJiK1QA2TodnuSUN+OVtfBDzAr2N820huTRpuEW4hWYL7Joi0JJ dXmve43+HC1s0iHbm0KZpKaUQhiLxXoZx+AF6ec3WJTXz3oOk2BuP+ddhnro/7Mo 6qoytom+rqu07UAHnpGC =nO5G -----END PGP SIGNATURE----- --IS0zKkzwUGydFO0o--