Package Info

git-merge-changelog


Git merge driver for ChangeLog files


Development/Tools/Version Control

Git merge driver for ChangeLog files.

  1. It produces no conflict when ChangeLog entries have been inserted

at the top both in the public and in the private modification. It puts the privately added entries above the publicly added entries. 2. It respects the structure of ChangeLog files: entries are not split into lines but kept together. 3. It also handles the case of small modifications of past ChangeLog entries, or of removed ChangeLog entries: they are merged as one would expect it. 4. Conflicts are presented at the top of the file, rather than where they occurred, so that the user will see them immediately. (Unlike for source code written in some programming language, conflict markers that are located several hundreds lines from the top will not cause any syntax error and therefore would be likely to remain unnoticed.)


License: GPL-3.0+
URL: http://www.gnu.org/software/gnulib

Categories

Releases

Package Version Update ID Released Package Hub Version Platforms Subpackages
20120413-bp155.2.10 info GA Release 2023-05-17 15 SP5
  • AArch64
  • ppc64le
  • s390x
  • x86-64
  • git-merge-changelog
20120413-bp154.1.23 info GA Release 2022-05-09 15 SP4
  • AArch64
  • ppc64le
  • s390x
  • x86-64
  • git-merge-changelog
20120413-bp153.1.14 info GA Release 2021-02-26 15 SP3
  • AArch64
  • ppc64le
  • s390x
  • x86-64
  • git-merge-changelog
20120413-bp152.3.13 info GA Release 2020-04-16 15 SP2
  • AArch64
  • ppc64le
  • s390x
  • x86-64
  • git-merge-changelog
20120413-bp151.3.1 info GA Release 2019-07-17 15 SP1
  • AArch64
  • s390x
  • x86-64
  • git-merge-changelog
20120413-bp151.2.15 info GA Release 2019-05-18 15 SP1
  • ppc64le
  • git-merge-changelog
20120413-bp150.2.5 info GA Release 2018-07-30 15
  • AArch64
  • git-merge-changelog
20120413-bp150.2.4 info GA Release 2018-07-30 15
  • ppc64le
  • s390x
  • x86-64
  • git-merge-changelog