From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 97232 invoked by alias); 19 Mar 2018 18:33:49 -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 97029 invoked by uid 89); 19 Mar 2018 18:33:48 -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=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS,TIME_LIMIT_EXCEEDED,T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 spammy= X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS,TIME_LIMIT_EXCEEDED,T_RP_MATCHES_RCVD autolearn=unavailable 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; Mon, 19 Mar 2018 18:33:38 +0000 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 58C1372D562 for ; Mon, 19 Mar 2018 21:33:35 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 444917CC755; Mon, 19 Mar 2018 21:33:35 +0300 (MSK) Date: Mon, 19 Mar 2018 18:33:00 -0000 From: "Dmitry V. Levin" To: elfutils-devel@sourceware.org Subject: [PATCH] Specify a custom git merge driver for ChangeLog files Message-ID: <20180319183335.GA23327@altlinux.org> Mail-Followup-To: elfutils-devel@sourceware.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-IsSubscribed: yes X-SW-Source: 2018-q1/txt/msg00082.txt.bz2 Signed-off-by: Dmitry V. Levin --- .gitattributes | 1 + ChangeLog | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ca4ea27 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/ChangeLog b/ChangeLog index 279c3b2..91258e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-03-19 Dmitry V. Levin + + * .gitattributes: New file. + 2018-02-09 Joshua Watt * configure.ac (HAVE_FALLTHROUGH): New define. -- ldv