summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/local/gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/local/gitconfig b/debian/local/gitconfig
index a62573f..cd42c55 100644
--- a/debian/local/gitconfig
+++ b/debian/local/gitconfig
@@ -27,3 +27,6 @@
# depends: dpkg-dev
name = debian/changelog merge driver
driver = dpkg-mergechangelogs -m %O %A %B %A
+
+[pull]
+ rebase = true