From f9e37dbc186b6554042f31b2bd3cef6e9f339fa9 Mon Sep 17 00:00:00 2001
From: druckdev <druckdev@protonmail.com>
Date: Sun, 29 Nov 2020 13:49:46 +0100
Subject: [PATCH] git: Set pull.rebase and merge.log

Rebase branches on top of the fetched branch, instead of merging.
Include summaries of merged commits in new merge commit messages.
---
 .config/git/config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.config/git/config b/.config/git/config
index 387b9ed..fb4e8f6 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -24,3 +24,7 @@
 	autostash = true
 [include]
 	path = user.config
+[pull]
+	rebase = true
+[merge]
+	log = true