mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![]() 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> |
||
---|---|---|
.. | ||
.gitignore | ||
branches-- | ||
hooks--applypatch-msg | ||
hooks--commit-msg | ||
hooks--post-commit | ||
hooks--post-update | ||
hooks--pre-applypatch | ||
hooks--pre-commit | ||
hooks--pre-rebase | ||
hooks--update | ||
info--exclude | ||
Makefile | ||
remotes-- | ||
this--description |