pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-03-29 18:16:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Document check-merge-conflict argument

Browse source 
Document --assume-in-merge in README
This commit is contained in:
Bastien Gérard 2022-04-25 12:20:30 +02:00 • committed by GitHub
parent 5d1ab6d7f3
commit aa56da8535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -57,6 +57,7 @@ Attempts to load all json files to verify syntax.
#### `check-merge-conflict`
Check for files that contain merge conflict strings.
- `--assume-in-merge` - Allows running the hook when there is no ongoing merge operation
#### `check-shebang-scripts-are-executable`
Checks that scripts with shebangs are executable.