My pre-commit hook

pre-commit

#!/bin/bash

debug=`git diff --cached | grep -C 2 -E '+\s*And (open|show me the page)'`
conflicts=`git diff --cached | grep -C 2 -E '<<<|>>>'`

if [ -n "$debug" ]; then
  echo "debugging statements added in this commit"
  echo $debug
fi

if [ -n "$conflicts" ]; then
  echo "unresolved merge conflicts added in this commit"
  echo $conflicts
fi

if [[ -n "$conflicts" || -n "$debug" ]]; then
  exit 1
fi