mirror of
https://github.com/pre-commit/pre-commit-hooks.git
synced 2026-04-05 19:46:54 +00:00
Merge 97a00d0324 into 78818b90cd
This commit is contained in:
commit
e271a21735
12 changed files with 271 additions and 0 deletions
|
|
@ -49,6 +49,12 @@
|
|||
entry: pretty-format-json
|
||||
language: python
|
||||
files: \.json$
|
||||
- id: pretty-format-yaml
|
||||
name: Pretty format YAML
|
||||
description: This hook sets a standard for formatting YAML files.
|
||||
entry: pretty-format-yaml
|
||||
language: python
|
||||
files: \.(yaml|yml|eyaml)$
|
||||
- id: check-merge-conflict
|
||||
name: Check for merge conflicts
|
||||
description: Check for files that contain merge conflict strings.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue