Junio C Hamano 61c2bcbd11 pre-commit hook: complain about conflict markers. ... Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net>		2006-04-19 15:37:40 -07:00
..
.gitignore
branches--
hooks--applypatch-msg	sample hooks template.	2006-02-26 15:16:41 -08:00
hooks--commit-msg
hooks--post-commit
hooks--post-update
hooks--pre-applypatch	sample hooks template.	2006-02-26 15:16:41 -08:00
hooks--pre-commit	pre-commit hook: complain about conflict markers.	2006-04-19 15:37:40 -07:00
hooks--pre-rebase	rebase: allow a hook to refuse rebasing.	2006-02-13 00:17:33 -08:00
hooks--update	sample update-hook: sanely handle a new branch head.	2006-01-24 17:38:06 -08:00
info--exclude
Makefile	Clean build annoyance.	2005-11-08 08:58:52 -08:00
remotes--
this--description