From 50f95b448151c1e1695fca2f67cb7991b57e874b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Jul 2024 20:08:08 +0200 Subject: [PATCH] git-merge-changelog: Simplify installation instructions. Reported by Samuel Bronson via Simon Josefsson in . * lib/git-merge-changelog.c: Suggest creating a .gitattributes file only at the top-level. --- ChangeLog | 8 ++++++++ lib/git-merge-changelog.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac83778598..fcef360b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-07-02 Bruno Haible + + git-merge-changelog: Simplify installation instructions. + Reported by Samuel Bronson via Simon Josefsson in + . + * lib/git-merge-changelog.c: Suggest creating a .gitattributes file only + at the top-level. + 2024-07-02 Bruno Haible uniname/uniname: Modernize gen-uninames.lisp. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 3cffe1fd2f..60754c8367 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -1,5 +1,5 @@ /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files. - Copyright (C) 2008-2021 Bruno Haible + Copyright (C) 2008-2024 Bruno Haible This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -55,8 +55,8 @@ name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B - - In every directory that contains a ChangeLog file, add a file - '.gitattributes' with this line: + - Add to the top-level directory of the checkout a file '.gitattributes' + with this line: ChangeLog merge=merge-changelog @@ -77,12 +77,12 @@ Additionally, for hg users: - Add to your $HOME/.hgrc the lines - [merge-patterns] - ChangeLog = git-merge-changelog + [merge-patterns] + ChangeLog = git-merge-changelog - [merge-tools] - git-merge-changelog.executable = /usr/local/bin/git-merge-changelog - git-merge-changelog.args = $base $local $other + [merge-tools] + git-merge-changelog.executable = /usr/local/bin/git-merge-changelog + git-merge-changelog.args = $base $local $other See section merge-tools for reference. -- 2.39.5