Re: git-rerere observations and feature suggestions

* Jeff King [off-list ref] wrote:

quoted

( and if i could configure git-commit to outright reject a commit like 
  that - i never want to commit lines with <<<<<< or >>>>> markers)

The right place for this is in a pre-commit hook, which can look at 
what you are about to commit and decide if it is OK. In fact, the 
default pre-commit hook that ships with git performs this exact check. 
You just need to turn it on with:

  chmod +x .git/hooks/pre-commit

cool, thanks :-)

	Ingo