Parcourir la source

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

main
Eric Amodio il y a 7 ans
Parent
révision
d34b97de22
1 fichiers modifiés avec 5 ajouts et 2 suppressions
  1. +5
    -2
      src/git/git.ts

+ 5
- 2
src/git/git.ts Voir le fichier

@ -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`);
}

Chargement…
Annuler
Enregistrer