From 821d3028f391ed1659186b68659d902dd0a2713e Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Mon, 6 Sep 2021 22:34:20 +1200
Subject: [PATCH 1/1] include merge commits in rebase

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index ee3ea53..170d504 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -65,5 +65,7 @@
 	enabled = true
 [rebase]
 	autosquash = true
+[pull]
+	rebase = merges
 [advice]
 	ignoredHook = false
-- 
2.39.5