| commit | aa56da853574fa6128b06cf53f5b6bdbc16d4534 | [log] [tgz] |
|---|---|---|
| author | Bastien Gérard <bast.gerard@gmail.com> | Mon Apr 25 12:20:30 2022 +0200 |
| committer | GitHub <noreply@github.com> | Mon Apr 25 12:20:30 2022 +0200 |
| tree | 78f3ce3b05cf4371d7fb0a9e78dcf90c3e17f1d2 | |
| parent | 5d1ab6d7f3e8f928c896232d2fb0ff95b3563ca6 [diff] |
Document check-merge-conflict argument Document --assume-in-merge in README
diff --git a/README.md b/README.md index 7368831..2c8cf4f 100644 --- a/README.md +++ b/README.md
@@ -57,6 +57,7 @@ #### `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.