From 41bb12d0c06734c667918023c28f0caddd14738b Mon Sep 17 00:00:00 2001
From: "Dmitriy K." <kagno.dmitriy@gmail.com>
Date: Thu, 5 Sep 2024 06:08:00 -0400
Subject: [PATCH] skip pre-commit on merge and rebase, add pre-push (#1607)

---
 lefthook.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lefthook.yml b/lefthook.yml
index 01ffebc69c7..662d3b5617b 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -2,6 +2,15 @@ pre-commit:
   parallel: true
   commands:
     eslint:
-      glob: '*.{js,jsx,ts,tsx}'
+      glob: "*.{js,jsx,ts,tsx}"
       run: npx eslint --fix {staged_files}
-      stage_fixed: true
\ No newline at end of file
+      stage_fixed: true
+      skip:
+        - merge
+        - rebase
+
+pre-push:
+  commands:
+    eslint:
+      glob: "*.{js,ts,jsx,tsx}"
+      run: npx eslint --fix {push_files}
\ No newline at end of file