Git pre-commit hook to reject commits that contain Git conflict markers.

gistfile1.sh

#!/bin/sh
# Add this to .git/hooks/pre-commit to reject any commits
# that contain Git conflict markers.

if git diff --cached --name-only --diff-filter=ACM | xargs grep -H -n -E '^(<|>|=|\|){7}' > /dev/null; then
  echo "\033[31mWarning:\033[0m You have left some Git conflict markers in."
  echo 'Your commit is bad and you should feel bad.'
  echo
  git diff --cached --name-only --diff-filter=ACM | xargs grep -H -n -E '^(<|>|=|\|){7}'
  exit 1
fi