summary refs log tree commit diff
path: root/pre-commit-hook
blob: fa79d73afc3608b7503c351c236cf8c8f5e68340 (plain) (blame)
1
2
3
4
5
6
7
8
9
#!/usr/bin/env bash

if git grep --cached -I -e '<<<<<<<' -e '>>>>>>>' > /dev/null; then
	echo 'Cowardly refusing to commit with unresolved merges'
	exit 1
fi

exit 0