From 32b2bdb8b8d992083b1d1d5e33095409ef0901ac Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Mon, 18 May 2020 00:36:30 -0400
Subject: [PATCH] Use --first-parent for log with --follow

Removes bogus merge commits that can show up in the history
---
 src/git/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/git/git.ts b/src/git/git.ts
index 6d678fd..d3a37b1 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -804,7 +804,7 @@ export namespace Git {
 			params.push(`--diff-filter=${filters.join(emptyStr)}`);
 		}
 
-		if (firstParent) {
+		if ((all !== true && renames) || firstParent) {
 			params.push('--first-parent');
 		}