diff --git a/lint.sh b/lint.sh
index 15233e7a8..7794b6fe8 100755
--- a/lint.sh
+++ b/lint.sh
@@ -1,10 +1,41 @@
 #!/bin/bash
 
-set -o xtrace
 set -o errexit
 
-isort --check-only --diff .
-black --diff --check .
+help_and_exit() {
+    echo "Usage: ./lint.sh [-f|--filter]"
+    echo "  -f,  --filter         format code instead of just checking the format"
+    exit 1
+}
+
+if [[ $# -gt 1 ]]; then
+    help_and_exit
+fi
+
+FORMAT=0
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -f | --format)
+            FORMAT=1
+            shift
+            ;;
+        *)
+            help_and_exit
+            ;;
+    esac
+done
+
+set -o xtrace
+
+if [[ $FORMAT == 1 ]]; then
+    isort .
+    black .
+else
+    isort --check-only --diff .
+    black --check --diff .
+fi
+
 flake8 --show-source .
 
 # Indents are four spaces, binary ops can start a line, and indent switch cases