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 | 357cb6f7f0fc9d457df1497009dcabf0b136b87e (patch) | |
| tree | 815e6e088013286ec80e6e8433f3befbcd99730c | |
| parent | Adding dpkg-mergechangelogs merge driver for debian/changelog files. (diff) | |
| download | git-357cb6f7f0fc9d457df1497009dcabf0b136b87e.tar.xz git-357cb6f7f0fc9d457df1497009dcabf0b136b87e.zip | |
Setting pull.rebase to true.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/local/gitconfig | 3 |
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 |