From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 23 Jun 2008 15:22:48 GMT
Subject: Re: git-rerere observations and feature suggestions
Message-ID: <20080623152248.GB28394@elte.hu>
In-Reply-To: <20080623151201.GB20902@sigill.intra.peff.net>


* Jeff King <peff@peff.net> wrote:

> > ( 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