diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:54:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:54:20 +0000 |
| commit | 1b7ab5c655939a39c00d4b0a125e5d687304f9fb (patch) | |
| tree | 6c4f2a65e1f7ef55de3d75df7188b45125c77fae /debian/local/gitconfig | |
| parent | Setting log.follow to true. (diff) | |
| download | git-1b7ab5c655939a39c00d4b0a125e5d687304f9fb.tar.xz git-1b7ab5c655939a39c00d4b0a125e5d687304f9fb.zip | |
Adding dpkg-mergechangelogs merge driver for debian/changelog files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/local/gitconfig')
| -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 |