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/gitattributes | |
| 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/gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/local/gitattributes b/debian/local/gitattributes new file mode 100644 index 0000000..35a8b89 --- /dev/null +++ b/debian/local/gitattributes @@ -0,0 +1,3 @@ +# /etc/gitattributes + +debian/changelog merge=dpkg-mergechangelogs |