From a7d24d9dacbe42416cc469ff8dc17817cdccf228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 18 Sep 2024 16:26:34 +0200
Subject: [PATCH] ci: Skip running pre-commit hooks on rebase and merge
 (no-changelog) (#10875)

---
 lefthook.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lefthook.yml b/lefthook.yml
index bb58014db9..cc39a32495 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -4,7 +4,13 @@ pre-commit:
       glob: 'packages/**/*.{js,ts,json}'
       run: ./node_modules/.bin/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
       stage_fixed: true
+      skip:
+        - merge
+        - rebase
     prettier_check:
       glob: 'packages/**/*.{vue,yml,md}'
       run: ./node_modules/.bin/prettier --write --ignore-unknown --no-error-on-unmatched-pattern {staged_files}
       stage_fixed: true
+      skip:
+        - merge
+        - rebase