Merge branch 'js/rebase-i-progress-tidy'

diff --git a/builtin/commit.c b/builtin/commit.c
index 1f6dbcd0d06a54eadc0d99a676adf3a9203aca61..77e3dc849419e697abe8f2f4c7d753cce17634a8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1617,7 +1617,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
                OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
                OPT_BOOL('o', "only", &only, N_("commit only specified files")),
-               OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
+               OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
                OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
                OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
                            STATUS_FORMAT_SHORT),