| commit | 635fa7dd9d885a0745ee72a7e5ce4fb6694766de | [log] [tgz] |
|---|---|---|
| author | Anthony Sottile <asottile@umich.edu> | Fri Mar 20 16:15:09 2015 -0700 |
| committer | Anthony Sottile <asottile@umich.edu> | Fri Mar 20 16:21:02 2015 -0700 |
| tree | 0d041dbfaeb18b75b996e9c302489a8aea1ed6f2 | |
| parent | 34444ba2c7f8f899f3198240673418665f811a1c [diff] |
Only check merge conflicts on conflict commits
Some out-of-the-box hooks for pre-commit.
See also: https://github.com/pre-commit/pre-commit
Add this to your .pre-commit-config.yaml
- repo: git://github.com/pre-commit/pre-commit-hooks
sha: '' # Use the sha you want to point at
hooks:
- id: trailing-whitespace
# - id: ...
autopep8-wrapper - Runs autopep8 over python source. (You'll want args: ['-i] when using this hook, see .pre-commit-config.yaml for an example.)check-added-large-files - Prevent giant files from being committed.check-case-conflict - Check for files that would conflict in case-insensitive filesystems.check-docstring-first - Checks a common error of defining a docstring after code.check-json - Attempts to load all json files to verify syntax.check-merge-conflict - Check for files that contain merge conflict strings.check-xml - Attempts to load all xml files to verify syntax.check-yaml - Attempts to load all yaml files to verify syntax.debug-statements - Check for pdb / ipdb / pudb statements in code.detect-private-key - Checks for the existence of private keysdouble-quote-string-fixer - This hook replaces double quoted strings with single quoted stringsend-of-file-fixer - Makes sure files end in a newline and only a newline.flake8 - Run flake8 on your python filesname-tests-test - Assert that files in tests/ end in _test.pypyflakes - Run pyflakes on your python filesrequirements-txt-fixer - Sorts entries in requirements.txttrailing-whitespace - Trims trailing whitespace.If you‘d like to use these hooks, they’re also available as a standalone package.
Simply pip install pre-commit-hooks