From 53ba3767bf12ede6b9f7055150a24ad00f2563bc Mon Sep 17 00:00:00 2001
From: Magnus Holmgren <maho@utklippan.millnet.site>
Date: Thu, 7 Sep 2023 19:45:24 +0200
Subject: [PATCH] Pass --simplify-merges to git log to counteract the change in
 git 2.36 that disables history simplification when doing separate and remerge
 style merge diffs

Fixes #129.
---
 src/git.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/git.cpp b/src/git.cpp
index 6a5a44c..ace7340 100644
--- a/src/git.cpp
+++ b/src/git.cpp
@@ -2191,7 +2191,7 @@ bool Git::startRevList(SCList args, FileHistory* fh) {
            then, with this option, file history is truncated to
            the file deletion revision.
         */
-                initCmd << QString("-r -m -p --full-index").split(' ');
+                initCmd << QString("-r -m -p --full-index --simplify-merges").split(' ');
         } else
                 {} // initCmd << QString("--early-output"); currently disabled