diff options
| author | Lucas CHOLLET <lucas.chollet@free.fr> | 2022-11-19 16:53:54 +0100 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-12-10 12:07:06 +0000 |
| commit | 839c1a574df18b82066de13f85c3cca208cf4f4f (patch) | |
| tree | c90c6932aa3d2bf00335092deb9573075aeb9a93 /.github | |
| parent | f93c7fbb5e13a53af13afbfbc66a875175fffa12 (diff) | |
| download | serenity-839c1a574df18b82066de13f85c3cca208cf4f4f.zip | |
CI: Add a check to report git merge commit
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/lintcommits.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/lintcommits.yml b/.github/workflows/lintcommits.yml index 7263eef04c..14d65ad89e 100644 --- a/.github/workflows/lintcommits.yml +++ b/.github/workflows/lintcommits.yml @@ -29,6 +29,10 @@ jobs: error: "Commit message lines are too long (maximum allowed is 72 characters, except for URLs)", }, { + pattern: /^Merge branch/, + error: "Commit is a git merge commit, use the rebase command instead", + }, + { pattern: /^\S.*?\S: .+/, error: "Missing category in commit title (if this is a fix up of a previous commit, it should be squashed)", }, |