diff --git a/dev/githooks/pre-commit.d/04-check-clang-format b/dev/githooks/pre-commit.d/04-check-clang-format
index afed2f16..1e68523d 100755
--- a/dev/githooks/pre-commit.d/04-check-clang-format
+++ b/dev/githooks/pre-commit.d/04-check-clang-format
@@ -1,42 +1,50 @@
 #!/bin/bash
 ###
 # Check all added or modified C++ source files for correct formatting
 ###
 
 set -e
 
 if ! which clang-format >/dev/null 2>&1
 then
 	echo "Please install clang-format!"
 fi
+if [[ "$CHECK_CLANG_FORMAT" == false ]]
+then
+	printf "Remember, this is not for checking in unformatted changes!\n"
+	printf "It's YOUR responsability to run clang-format on your changes!\n"
+	sleep 3
+	exit 0
+fi
 
 check_format()
 # check_format FILE
 # return 0 iff FILE is formatted correctly
 {
 	[[ $(clang-format -style=file -output-replacements-xml "$1" | wc -l) -eq 3 ]]
 }
 
 reformat_files=
 IFS=$'\n'
 for line in $(git status -s)
 do
 	# if the file is added or modified
 	if [[ "$line" == A* || "$line" == M* ]]
 	then
 		if [[ "$line" == *.cpp || "$line" == *.h ]]
 		then
 			if ! check_format "${line:3}"
 			then
 				reformat_files="$reformat_files\n   ${line:3}"
 			fi
 		fi
 	fi
 done
 
 if [[ -n "$reformat_files" ]]
 then
 	printf "Incorrect coding style:$reformat_files\n"
-	printf "** Run \"git clang-format\" to reformat all staged changes..."
+	printf "** Run \"git clang-format\" to reformat all staged changes, or\n"
+	printf "** run \"dev/scripts/clang-format-all.sh\" to reformat all source files...\n"
 	exit 1
 fi