From ea214c16db999ddab9c7d43fa30b645e6d46e616 Mon Sep 17 00:00:00 2001 From: Marko Korhonen 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 9734926e..8be410c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -28,4 +28,4 @@ cmd = nvim -d -c 'set nomodifiable' [pull] - rebase = false + rebase = merges