summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:54:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:54:20 +0000
commita3bbbc1dfa4458c621785f5108135bb81ed9316e (patch)
tree7d666cdc4deffdf688444ec7f8fb2474085f4c49
parentAdding dpkg-mergechangelogs merge driver for debian/changelog files. (diff)
downloadgit-a3bbbc1dfa4458c621785f5108135bb81ed9316e.tar.xz
git-a3bbbc1dfa4458c621785f5108135bb81ed9316e.zip
Setting pull.rebase to true.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-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