[git] Fixed duplicated entries for git history on merge operations

Signed-off-by: Federico Bozzini <federico.bozzini@gmail.com>
eclipse-theia · Feb 25, 2020 · fc98cb6 · fc98cb6
1 parent 2ef80c0
commit fc98cb6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/git/src/node/dugite-git.ts b/packages/git/src/node/dugite-git.ts
@@ -647,7 +647,7 @@ export class DugiteGit implements Git {
             args.push('--first-parent');
         }
         const range = this.mapRange((options || {}).range);
-        args.push(...[range, '-C', '-M', '-m']);
+        args.push(...[range, '-C', '-M', '-m', '--first-parent']);
         const maxCount = options && options.maxCount ? options.maxCount : 0;
         if (Number.isInteger(maxCount) && maxCount > 0) {
             args.push(...['-n', `${maxCount}`]);