diff options
Diffstat (limited to 'git-hooks')
| -rwxr-xr-x | git-hooks/clang-format-pre-commit | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/git-hooks/clang-format-pre-commit b/git-hooks/clang-format-pre-commit index 1f97e61..ab5a8bc 100755 --- a/git-hooks/clang-format-pre-commit +++ b/git-hooks/clang-format-pre-commit @@ -30,9 +30,8 @@ fi if test -n "$CLANG_FORMAT_DIFF"; then echo "clang-format output:" echo "$CLANG_FORMAT_DIFF" - echo "clang-format detected change in format, please run:" - echo " git clang-format" - echo "and amend the change." - exit 1 + echo "clang-format suggests changes in the format. You can run:" + echo " git clang-format HEAD~1" + echo "and amend the commit with those changes that you agree with." + exit 0 fi - |