mirror of
https://github.com/git/git.git
synced 2024-05-26 08:16:12 +02:00
61c2bcbd11
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 | ||
| Makefile | ||
| 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 | ||
| remotes-- | ||
| this--description | ||