diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2204bb792..71e0a8853 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,3 +14,7 @@ jobs:
         python-version: "3.x"
 
     - uses: pre-commit/action@v3.0.0
+      with:
+        extra_args: --hook-stage manual
+      env:
+        SKIP: black-format
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d6b496a31..5664fe980 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,8 +3,16 @@ repos:
     rev: 23.9.1
     hooks:
       - id: black
+        alias: black-check
+        name: black (check)
         args: [--check, --diff]
         exclude: ^git/ext/
+        stages: [manual]
+
+      - id: black
+        alias: black-format
+        name: black (format)
+        exclude: ^git/ext/
 
   - repo: https://github.com/PyCQA/flake8
     rev: 6.1.0
diff --git a/README.md b/README.md
index c17340f63..8cb6c88c2 100644
--- a/README.md
+++ b/README.md
@@ -142,22 +142,22 @@ To test, run:
 pytest
 ```
 
-To lint, run:
+To lint, and apply automatic code formatting, run:
 
 ```bash
 pre-commit run --all-files
 ```
 
-To typecheck, run:
+Code formatting can also be done by itself by running:
 
-```bash
-mypy -p git
+```
+black .
 ```
 
-For automatic code formatting, run:
+To typecheck, run:
 
 ```bash
-black .
+mypy -p git
 ```
 
 Configuration for flake8 is in the `./.flake8` file.
diff --git a/tox.ini b/tox.ini
index ed7896b59..518577183 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,9 @@ commands = pytest --color=yes {posargs}
 [testenv:lint]
 description = Lint via pre-commit
 base_python = py39
-commands = pre-commit run --all-files
+set_env =
+    SKIP = black-format
+commands = pre-commit run --all-files --hook-stage manual
 
 [testenv:mypy]
 description = Typecheck with mypy