From 547cfe39a683b97a84923128ce4d710719876845 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 14 Nov 2009 15:58:57 -0800 Subject: [PATCH] Meta/Reintegrate: do not trigger pre-commit filter on merges --- Reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reintegrate b/Reintegrate index dfc5184226..55e35b6979 100755 --- a/Reintegrate +++ b/Reintegrate @@ -28,7 +28,7 @@ accept_rerere () { then return 1 else - EDITOR=: git commit -a + EDITOR=: git commit -a --no-verify return 0 fi }