diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 21:18:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 21:18:56 +0000 |
| commit | dc75889f92aadf0764311a7ca71957dbe84aff59 (patch) | |
| tree | b1c008820cb22697e8375931fc4ccc6d6338254f /debian/local/gitconfig | |
| parent | Setting log.follow to true. (diff) | |
| download | git-dc75889f92aadf0764311a7ca71957dbe84aff59.tar.xz git-dc75889f92aadf0764311a7ca71957dbe84aff59.zip | |
Adding dpkg-mergechangelogs merge driver for debian/changelog files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/local/gitconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/local/gitconfig b/debian/local/gitconfig index a48fcf4..a62573f 100644 --- a/debian/local/gitconfig +++ b/debian/local/gitconfig @@ -22,3 +22,8 @@ [log] follow = true + +[merge "dpkg-mergechangelogs"] + # depends: dpkg-dev + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A |