omit merge commits from next changelog

intuit · Apr 7, 2020 · 6ed13e1 · 6ed13e1
1 parent a5c98b0
commit 6ed13e1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/packages/core/src/auto.ts b/packages/core/src/auto.ts
@@ -1186,6 +1186,14 @@ export default class Auto {
 
     await this.setGitUser();
 
+    this.hooks.onCreateLogParse.tap("Omit merges from master", (logParse) => {
+      logParse.hooks.omitCommit.tap("Omit merges from master", (commit) => {
+        if (commit.subject.includes(`Merge origin/${this.baseBranch}`)) {
+          return true;
+        }
+      });
+    });
+
     const currentBranch = getCurrentBranch();
     const initialForkCommit = (
       (