Fixes #238 - shows merge commits in file history

gitkraken · Jan 4, 2018 · 4a59d98 · 4a59d98
1 parent 62efdba
commit 4a59d98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 - Fixes issue where the `GitLens Results` view wouldn't properly update when replacing existing results
 - Fixes issue where showing commit search (file-based) results in the `GitLens Results` view wouldn't only show the matching files -- closes [#197](https://github.com/eamodio/vscode-gitlens/issues/197)
+- Fixes [#238](https://github.com/eamodio/vscode-gitlens/issues/238) - Show merge commits in file history
 
 ## [7.2.0] - 2018-01-01
 ### Added

diff --git a/src/git/git.ts b/src/git/git.ts
@@ -382,12 +382,12 @@ export class Git {
         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');
+            // If we are looking for a specific sha don't simplify merges
+            if (!options.ref || options.maxCount! > 2) {
+                params.push('--simplify-merges');
+            }
         }
 
         if (options.ref && !Git.isStagedUncommitted(options.ref)) {