Add docs about skipping certain git states

cmd/run.go

@@ -111,7 +111,6 @@ func RunCmdExecutor(args []string, fs afero.Fs) error {
 	if !viper.IsSet(hooksGroup) && hooksGroup == "prepare-commit-msg" {
 		return nil
 	}
-
 	gitArgs := args[1:]
 	var wg sync.WaitGroup
 
@@ -176,7 +175,6 @@ func RunCmdExecutor(args []string, fs afero.Fs) error {
 }
 
 func executeCommand(hooksGroup, commandName string, wg *sync.WaitGroup, gitArgs []string) {
-	log.Println("executeCommand", hooksGroup)
 	defer wg.Done()
 
 	if getPiped(hooksGroup) && isPipeBroken {
@@ -235,7 +233,6 @@ func executeCommand(hooksGroup, commandName string, wg *sync.WaitGroup, gitArgs
 	}
 
 	if isSkipCommmand(hooksGroup, commandName) {
-		log.Println("skipping!!!!")
 		mutex.Lock()
 		spinner.RestartWithMsg(sprintSuccess("\n", au.Bold(commandName), au.Brown("(SKIP BY SETTINGS)")))
 		mutex.Unlock()

docs/full_guide.md

@@ -231,6 +231,26 @@ pre-push:
       skip: true
 ```
 
+## Skipping commands during rebase or merge
+
+You can skip commands during rebase and/or merge by the same `skip` option:
+
+```yml
+pre-push:
+  commands:
+    packages-audit:
+      skip: merge
+
+# or
+
+pre-push:
+  commands:
+    packages-audit:
+      skip:
+        - merge
+        - rebase
+```
+
 ## Skipping commands by tags
 
 If we have a lot of commands and scripts we can tag them and run skip commands with a specific tag.
@@ -281,7 +301,7 @@ If you need to extend config from some another place, just add top level:
 ```yml
 # lefthook.yml
 
-extends: 
+extends:
   - $HOME/work/lefthook-extend.yml
   - $HOME/work/lefthook-extend-2.yml
 ```