Skip to content

Commit 547cfe3

Browse files
committed
Meta/Reintegrate: do not trigger pre-commit filter on merges
1 parent 0303673 commit 547cfe3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Reintegrate

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ accept_rerere () {
2828
then
2929
return 1
3030
else
31-
EDITOR=: git commit -a
31+
EDITOR=: git commit -a --no-verify
3232
return 0
3333
fi
3434
}

0 commit comments

Comments
 (0)