From 930a7d0f5b398556a878f8106451f31ab3c9a99a Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 6 Jul 2022 16:27:41 +0100
Subject: [PATCH] dot/gitconfig.in: Add explicit `pull' setting.

Newer Git moans loudly without this because foolishness.
---
 dot/gitconfig.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 17cf5ae..20235cb 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -40,6 +40,9 @@
 [rebase]
 	autosquash = true
 
+[pull]
+	rebase = false
+
 [push]
 	default = upstream
 	followTags = true
-- 
2.11.0