Meta/Reintegrate: do not trigger pre-commit filter on merges

16 years ago · 547cfe39a6
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -28,7 +28,7 @@ accept_rerere () {
				@@ -28,7 +28,7 @@ accept_rerere () {
 	then
 		return 1
 	else
-		EDITOR=: git commit -a
+		EDITOR=: git commit -a --no-verify
 		return 0
 	fi
 }