From 3e815f6bf8a138396467e03418aba8ccc019ce7a Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sun, 12 Mar 2017 03:07:11 -0400
Subject: [PATCH] Switches to not show merge commits on file history

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

diff --git a/src/git/git.ts b/src/git/git.ts
index eb316d7..260ba5b 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -153,7 +153,7 @@ export class Git {
     static log(fileName: string, sha?: string, repoPath?: string, maxCount?: number, reverse: boolean = false) {
         const [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
 
-        const params = [...DefaultLogParams, `--follow`];
+        const params = [...DefaultLogParams, `--follow`, `--no-merges`];
         if (maxCount && !reverse) {
             params.push(`-n${maxCount}`);
         }
@@ -175,7 +175,7 @@ export class Git {
     static logRange(fileName: string, start: number, end: number, sha?: string, repoPath?: string, maxCount?: number) {
         const [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
 
-        const params = [...DefaultLogParams];
+        const params = [...DefaultLogParams, `--no-merges`];
         if (maxCount) {
             params.push(`-n${maxCount}`);
         }