| commit | 61c2bcbd11e3b66a328b3850c01592e5dc1c67bb | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 21:58:24 +0000 (19 14:58 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 22:37:40 +0000 (19 15:37 -0700) | ||
| tree | e0993e24ded9047c25d3ff9bdff58791f9699026 | treesnapshot (tar.gz zip) |
| parent | 50ac7408018209a2829b7948119270fec7e14ec8 | commitdiff |
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>
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>
| templates/hooks--pre-commit | diffblobblamehistory |