Here's my bash pre-commit hook to check for PHP syntax errors and accidentally committed merge conflicts: https://github.com/dave1010/scripts/blob/master/git-hooks/pr...