git/templates
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 Add new programs and stamp file to .gitignore. 2005-10-14 17:13:49 -07:00
Makefile Clean build annoyance. 2005-11-08 08:58:52 -08:00
branches-- Redo the templates generation and installation. 2005-08-06 13:49:26 -07:00
hooks--applypatch-msg sample hooks template. 2006-02-26 15:16:41 -08:00
hooks--commit-msg Big tool rename. 2005-09-07 17:45:20 -07:00
hooks--post-commit Add commit hook and make the verification customizable. 2005-08-19 16:23:31 -07:00
hooks--post-update Install sample hooks 2005-08-03 16:27:38 -07:00
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 Redo the templates generation and installation. 2005-08-06 13:49:26 -07:00
remotes-- [PATCH] Use .git/remote/origin, not .git/branches/origin. 2005-08-24 16:50:52 -07:00
this--description Redo the templates generation and installation. 2005-08-06 13:49:26 -07:00