From 32b4d27cd49289f522115be834a04c172eebbf2d Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Sun, 7 Jun 2020 16:44:15 +1000
Subject: [PATCH] Configure pull.rebase = false by default, since that's the
 expected behaviour and you now get warnings if it's not set

---
 config/git/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/git/config b/config/git/config
index 451cef1..d71f6d9 100644
--- a/config/git/config
+++ b/config/git/config
@@ -57,6 +57,9 @@
 [pretty]
 	graph = tformat:%C(auto)%h %G? %s% gD% D
 
+[pull]
+	rebase = false
+
 [push]
 	default = simple
 	gpgSign = if-asked