+2024-07-02 Bruno Haible <bruno@clisp.org>
+
+ git-merge-changelog: Simplify installation instructions.
+ Reported by Samuel Bronson <naesten@gmail.com> via Simon Josefsson in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2024-07/msg00014.html>.
+ * lib/git-merge-changelog.c: Suggest creating a .gitattributes file only
+ at the top-level.
+
2024-07-02 Bruno Haible <bruno@clisp.org>
uniname/uniname: Modernize gen-uninames.lisp.
/* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
- Copyright (C) 2008-2021 Bruno Haible <bruno@clisp.org>
+ Copyright (C) 2008-2024 Bruno Haible <bruno@clisp.org>
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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
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 <https://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
for reference.