Stops including -m when using --follow

Avoids bogus merge commits in file history when following renames
gitkraken · Apr 9, 2019 · 37a7f8b · 37a7f8b
1 parent a49eab6
commit 37a7f8b
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/git/git.ts b/src/git/git.ts
@@ -651,14 +651,11 @@ export class Git {
     ) {
         const [file, root] = Git.splitPath(fileName, repoPath);
 
-        const params = [...defaultLogParams, '-m'];
+        const params = [...defaultLogParams];
         if (options.maxCount && !options.reverse) {
             params.push(`-n${options.maxCount}`);
         }
-
-        if (options.renames) {
-            params.push('--follow');
-        }
+        params.push(options.renames ? '--follow' : '-m');
 
         if (options.ref && !Git.isStagedUncommitted(options.ref)) {
             if (options.reverse) {