ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-13 11:38:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switches to not show merge commits on file history

Browse Source
This commit is contained in:
Eric Amodio
2017-03-12 03:07:11 -04:00
parent 487fb5197c
commit 3e815f6bf8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/git/git.ts
View File

@@ -153,7 +153,7 @@ export class Git {
static log(fileName: string, sha?: string, repoPath?: string, maxCount?: number, reverse: boolean = false) { 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 [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
const params = [...DefaultLogParams, `--follow`]; const params = [...DefaultLogParams, `--follow`, `--no-merges`];
if (maxCount && !reverse) { if (maxCount && !reverse) {
params.push(`-n${maxCount}`); 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) { 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 [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
const params = [...DefaultLogParams]; const params = [...DefaultLogParams, `--no-merges`];
if (maxCount) { if (maxCount) {
params.push(`-n${maxCount}`); params.push(`-n${maxCount}`);
} }