Explorar el Código

Uses --simplify-merges instead of --no-merges

main
Eric Amodio hace 7 años
padre
commit
d34b97de22
Se han modificado 1 ficheros con 5 adiciones y 2 borrados
  1. +5
    -2
      src/git/git.ts

+ 5
- 2
src/git/git.ts Ver fichero

@ -384,10 +384,13 @@ export class Git {
params.push(`-n${options.maxCount}`);
}
// If we are looking for a specific sha don't exclude merge commits
if (options.skipMerges || !options.ref || options.maxCount! > 2) {
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`);
}

Cargando…
Cancelar
Guardar