diff --git a/pre-commit.py b/pre-commit.py
index 5a4e0def5c..3fe9766137 100755
--- a/pre-commit.py
+++ b/pre-commit.py
@@ -3,17 +3,38 @@
 from typing import List
 import subprocess
 import sys
+import enum
+import argparse
+import os
+
+
+@enum.unique
+class Color(enum.Enum):
+    RED = "\033[0;31m"
+    GREEN = "\033[0;33m"
+    CYAN = "\033[0;36m"
+
 
-RED = "\033[0;31m"
-GREEN = "\033[0;33m"
-CYAN = "\033[0;36m"
 NC = "\033[0m"  # No Color
 
 
-def fix_inplace() -> bool:
-    if len(sys.argv) == 2 and sys.argv[1] == "--fix-inplace":
-        return True
-    return False
+def colorify(
+    s: str,
+    color: Color,
+    no_color: bool = False,
+):
+    if no_color:
+        return s
+    return f"{color.value}{s}{NC}"
+
+
+def rustfmt(fix_inplace: bool = False, no_color: bool = False) -> str:
+    cmd = "rustfmt --edition=2018"
+    if not fix_inplace:
+        cmd += " --check"
+    if no_color:
+        cmd += " --color=never"
+    return cmd
 
 
 def get_commit_files() -> List[str]:
@@ -23,33 +44,46 @@ def get_commit_files() -> List[str]:
     return files.decode().splitlines()
 
 
-def check(name: str, suffix: str, cmd: str, changed_files: List[str]):
+def check(
+    name: str, suffix: str, cmd: str, changed_files: List[str], no_color: bool = False
+):
     print(f"Checking: {name} ", end="")
     applicable_files = list(
         filter(lambda fname: fname.strip().endswith(suffix), changed_files)
     )
     if not applicable_files:
-        print(f"{CYAN}[NOT APPLICABLE]{NC}")
+        print(colorify("[NOT APPLICABLE]", Color.CYAN, no_color))
         return
 
     cmd = f'{cmd} {" ".join(applicable_files)}'
     res = subprocess.run(cmd.split(), capture_output=True)
     if res.returncode != 0:
-        print(f"{RED}[FAILED]{NC}")
+        print(colorify("[FAILED]", Color.RED, no_color))
         print("Please inspect the output below and run make fmt to fix automatically\n")
         print(res.stdout.decode())
         exit(1)
-    print(f"{GREEN}[OK]{NC}")
+
+    print(colorify("[OK]", Color.GREEN, no_color))
 
 
 if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--fix-inplace", action="store_true", help="apply fixes inplace"
+    )
+    parser.add_argument(
+        "--no-color", action="store_true", help="disable colored output", default=not sys.stdout.isatty()
+    )
+    args = parser.parse_args()
+
     files = get_commit_files()
-    rustfmt = "rustfmt --edition=2018"
-    if not fix_inplace():
-        rustfmt += " --check"
+    # we use rustfmt here because cargo fmt does not accept list of files
+    # it internally gathers project files and feeds them to rustfmt
+    # so because we want to check only files included in the commit we use rustfmt directly
     check(
         name="rustfmt",
         suffix=".rs",
-        cmd=rustfmt,
+        cmd=rustfmt(fix_inplace=args.fix_inplace, no_color=args.no_color),
         changed_files=files,
+        no_color=args.no_color,
     )