mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-05-21 21:08:12 +02:00
pre-commit: check for merge conflicts too
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1480>
This commit is contained in:
parent
61b3b785ae
commit
41b384d52e
1 changed files with 1 additions and 0 deletions
|
|
@ -4,6 +4,7 @@ repos:
|
|||
hooks:
|
||||
- id: end-of-file-fixer
|
||||
- id: trailing-whitespace
|
||||
- id: check-merge-conflict
|
||||
- id: no-commit-to-branch
|
||||
args: ['--branch', 'main']
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue