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

Junio C Hamano committed Nov 14, 2009 at 15:58 UTC 547cfe39a683b97a84923128ce4d710719876845
1 file changed +1 -1
Reintegrate
+1 -1
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 }