From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23375 invoked by alias); 25 Jul 2014 22:43:53 -0000 Mailing-List: contact src-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: src-cvs-owner@sourceware.org Received: (qmail 23298 invoked by uid 10022); 25 Jul 2014 22:43:52 -0000 Date: Fri, 25 Jul 2014 22:43:00 -0000 Message-ID: <20140725224348.23252.qmail@sourceware.org> From: sbronson@sourceware.org To: src-cvs@sourceware.org Subject: gdb and binutils branch master updated. a843ea33df65b47d5ff525231a5b582e9cd4e5b3 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d54398a79e97eff8f51aed2035cb513cdc4fb319 X-Git-Newrev: a843ea33df65b47d5ff525231a5b582e9cd4e5b3 X-SW-Source: 2014-q3/txt/msg00002.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "gdb and binutils". The branch, master has been updated via a843ea33df65b47d5ff525231a5b582e9cd4e5b3 (commit) from d54398a79e97eff8f51aed2035cb513cdc4fb319 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a843ea33df65b47d5ff525231a5b582e9cd4e5b3 commit a843ea33df65b47d5ff525231a5b582e9cd4e5b3 Author: Samuel Bronson Date: Thu Jun 19 21:59:19 2014 -0400 Add a .gitattributes file for use with git-merge-changelog 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. Did step (2) from .gitattributes With this patch applied and the above two steps done by whatever means you deem best, you can say goodbye to merge conflicts in ChangeLog files -- at least *IF* people stop renaming the danged things, anyway. If you don't do step 2, you will continue to suffer from ChangeLog merge conflicts exactly as before, whether or not you did step 1. If you do step 2 but not step 1, git will likely start complaining that it can't find any "git-merge-changelog" to run. [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 that you need a .gitattributes in every directory. The docs are wrong. Ignore the docs. Well, not the whole docs; just that part. 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 "/", as explained in the gitignore(5) manpage.] ----------------------------------------------------------------------- Summary of changes: .gitattributes | 20 ++++++++++++++++++++ ChangeLog | 4 ++++ 2 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 .gitattributes hooks/post-receive -- gdb and binutils