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