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
@@ -28,7 +28,7 @@ accept_rerere () {
28
then
29
return 1
30
else
31
- EDITOR=: git commit -a
31
+ EDITOR=: git commit -a --no-verify
32
return 0
33
fi
34
}