pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-08 12:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Only check merge conflicts on conflict commits

Browse source
This commit is contained in:
Anthony Sottile 2015-03-20 16:15:09 -07:00
parent 34444ba2c7
commit 635fa7dd9d
3 changed files with 73 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pylintrc
View file

@ -1,5 +1,5 @@
[MESSAGES CONTROL]
disable=bad-open-mode,invalid-name,missing-docstring,redefined-outer-name,star-args
disable=bad-open-mode,invalid-name,missing-docstring,redefined-outer-name,star-args,locally-disabled
[REPORTS]
output-format=colorized