Merge pull request #139 from millnet-maho/simplify-merges

Pass --simplify-merges to git log to counteract the change in git 2.36 that disables history simplification
tibirna · Sep 7, 2023 · 679836a · 679836a
2 parents 1075280 + 53ba376
commit 679836a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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