summaryrefslogtreecommitdiffstats
path: root/mergetools
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:49:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:49:05 +0000
commit067b1f4ae6fdb573b2954e73d36b27ca06d1d9ca (patch)
treeb98be875946f705872c379ab80ee775c03d95e75 /mergetools
parentAdding dpkg-mergechangelogs merge driver for debian/changelog files. (diff)
downloadgit-067b1f4ae6fdb573b2954e73d36b27ca06d1d9ca.tar.xz
git-067b1f4ae6fdb573b2954e73d36b27ca06d1d9ca.zip
Setting pull.rebase to true.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions