Git merge driver for ChangeLog files
https://www.gnu.org/software/gnulib
Git Merge Changelog is a git merge driver for changelogs that combines
parallel additions to the changelog without generating merge conflicts.
It can be enabled for specific files by setting appropriate git attributes.
See also: git, git-absorb, git-annex, git-autofixup, git-cola, git-core-doc, git-cpan-patch, git-credential-azure, git-credential-oauth, git-crypt, git-cvs, git-daemon, git-email, git-extras, git-fame, git-filter-repo, git-ftp, git-gui, git-instaweb, git-lfs, git-octopus, git-p4, git-publish, git-remote-gcrypt, git-remote-hg, git-review, git-revise, git-secret, git-secrets, git-subtree, git-svn, git-tools, git-xcleaner.
General Commands | |
| git-merge-changelog | manual page for git-merge-changelog git-merge-changelog |