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

diff --git a/Reintegrate b/Reintegrate
index dfc51842260a0356c74667a1534539cbd0ffbc7d..55e35b697902d8aac565765c2aa2b6483fcf2e47 100755 (executable)
--- 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
 }