From 5192303cbd0b2804933e78aad12048d0820695f5 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Tue, 22 Feb 2022 14:33:56 +0100
Subject: Update gitconfig

---
 .config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.config')

diff --git a/.config/git/config b/.config/git/config
index 296caa0..63ea101 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -15,7 +15,7 @@
 	p    = push
 	pa   = push-all
 	prev = ! git show "HEAD:$1"
-	r    = rebase --preserve-merges -i
+	r    = rebase --rebase-merges -i
 	ra   = commit --amend --no-edit -a
 	rc   = rebase --continue
 	s    = status -s
-- 
cgit v1.1