diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:25 -0700 |
| commit | d9d7ab3b1d5a1d1e24b2249e612bab41819b6188 (patch) | |
| tree | 08e279278c97fe83f52903d63847e7cd367bfa74 | |
| parent | b7fb136bf6f49ff7849c8ed8e5d94ca55c210310 (diff) | |
| parent | def480fe99f142957338c4b01dc258a0070c8087 (diff) | |
| download | git-d9d7ab3b1d5a1d1e24b2249e612bab41819b6188.tar.gz | |
Merge branch 'os/no-verify-skips-commit-msg-too' into maint
"git commit --help" said "--no-verify" is only about skipping the
pre-commit hook, and failed to say that it also skipped the
commit-msg hook.
* os/no-verify-skips-commit-msg-too:
commit: describe that --no-verify skips the commit-msg hook in the help text
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1f6dbcd0d0..77e3dc8494 100644 --- 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), |