Re: git-rerere observations and feature suggestions

From: Ingo Molnar <mingo@elte.hu>
Date: Jun 23, 2008, 15:22 UTC
Message-ID: <20080623152248.GB28394@elte.hu>
In-Reply-To: <20080623151201.GB20902@sigill.intra.peff.net>

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

Show 9 quoted lines

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.