From patchwork Fri Jun 20 01:59:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Bronson X-Patchwork-Id: 1585 Received: (qmail 32687 invoked by alias); 20 Jun 2014 02:28:35 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 32574 invoked by uid 89); 20 Jun 2014 02:28:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=unavailable version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-qa0-f44.google.com Received: from mail-qa0-f44.google.com (HELO mail-qa0-f44.google.com) (209.85.216.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 20 Jun 2014 02:28:24 +0000 Received: by mail-qa0-f44.google.com with SMTP id hw13so2716666qab.31 for ; Thu, 19 Jun 2014 19:28:21 -0700 (PDT) X-Received: by 10.140.49.171 with SMTP id q40mr539625qga.7.1403231301272; Thu, 19 Jun 2014 19:28:21 -0700 (PDT) Received: from hydrogen (naesten-pt.tunnel.tserv4.nyc4.ipv6.he.net. [2001:470:1f06:57::2]) by mx.google.com with ESMTPSA id m1sm11424831qaz.27.2014.06.19.19.28.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 19 Jun 2014 19:28:20 -0700 (PDT) Received: from naesten by hydrogen with local (Exim 4.82) (envelope-from ) id 1WxoYq-0005SR-TU; Thu, 19 Jun 2014 22:28:16 -0400 From: Samuel Bronson To: binutils@sourceware.org,gdb-patches@sourceware.org Cc: gcc-patches@gcc.gnu.org Subject: [RFC] Add a .gitattributes file for use with git-merge-changelog Date: Thu, 19 Jun 2014 21:59:19 -0400 Message-ID: <87sin0gvr3.fsf@naesten.mooo.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS says I should?] Individual users will still have to: 1. Install git-merge-changelog 2. Set up the merge driver in their git config See gnulib's lib/git-merge-changelog.c [1] for details. For example, I: 1. Patched Debian's gnulib package to build git-merge-changelog, and sent the patch to the Debian maintainer, who then proceeded to not only accept my patch but even write a *manpage* for git-merge-changelog! (Let's hear it for Ian Beckwith.) So now, I can install it simply by running "apt-get install git-merge-changelog". (Except, of course, that I already have it installed from when I was testing my patch.) 2. Added this to my ~/.gitconfig: --8<---------------cut here---------------start------------->8--- [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = git-merge-changelog %O %A %B --8<---------------cut here---------------end--------------->8--- (You could just put it in the .git/config file for a given repository, but I can't really see much point in that.) With this patch applied and the above two tasks done by whatever means you deem best, you can say goodbye to merge conflicts in ChangeLog files. *IF* people will stop renaming the danged things, anyway. [1]: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c [Note: The docs for git-merge-changelog (the comments at the top) say you need a .gitattributes in every directory. The docs are wrong. Ignore the docs. You really only need one at the top level, since .gitattributes uses the same pattern matching rules as .gitignore, which match files in any subdirectory unless you prefix the pattern with a "/".] [Note 2: I already have copyright assignment papers on file for GDB.] --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..75abe79 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1)) +# to activate this +ChangeLog merge=merge-changelog