From d34b97de22f685b29f1ae51aa5834d5e9606e66b Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Thu, 4 Jan 2018 01:55:58 -0500
Subject: [PATCH] Uses --simplify-merges instead of --no-merges

---
 src/git/git.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/git/git.ts b/src/git/git.ts
index 6877957..df2b0ab 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -384,10 +384,13 @@ export class Git {
             params.push(`-n${options.maxCount}`);
         }
 
-        // If we are looking for a specific sha don't exclude merge commits
-        if (options.skipMerges || !options.ref || options.maxCount! > 2) {
+        if (options.skipMerges) {
             params.push(`--no-merges`);
         }
+        // If we are looking for a specific sha don't simplify merges
+        else if (!options.ref || options.maxCount! > 2) {
+            params.push(`--simplify-merges`);
+        }
         else {
             params.push(`-m`);
         }