From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Nov 2009 23:58:57 +0000 (-0800)
Subject: Meta/Reintegrate: do not trigger pre-commit filter on merges
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=547cfe39a683b97a84923128ce4d710719876845;p=thirdparty%2Fgit.git

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

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
 }