From 928436c1674ee0055de21aa3b4f4132171f94167 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 18 May 2021 09:03:12 +0300
Subject: [PATCH] Add rebase merges to gitconfig

---
 home/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/.gitconfig b/home/.gitconfig
index 9734926..8be410c 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -28,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 
 [pull]
-	rebase = false
+	rebase = merges