diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2019-08-07 20:57:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-07 21:37:33 +0200 |
| commit | bc40ce4de612942e9a6a755f7432806ee095bd82 (patch) | |
| tree | 5eeb2e755519e30ef7f8b16ad8e72e501fc5f64b /Documentation/githooks.txt | |
| parent | git-merge: honor pre-merge-commit hook (diff) | |
| download | git-bc40ce4de612942e9a6a755f7432806ee095bd82.tar.xz git-bc40ce4de612942e9a6a755f7432806ee095bd82.zip | |
merge: --no-verify to bypass pre-merge-commit hook
Analogous to commit, introduce a '--no-verify' option which bypasses the
pre-merge-commit hook. The shorthand '-n' is taken by '--no-stat'
already.
[js: * reworded commit message to reflect current state of --no-stat flag
and new hook name
* fixed flag documentation to reflect new hook name
* cleaned up trailing whitespace
* squashed test changes from the original series' patch 4/4
* modified tests to follow pattern from this series' patch 1/4
* added a test case for --no-verify with non-executable hook
* when testing that the merge hook did not run, make sure we
actually have a merge to perform (by resetting the "side" branch
to its original state).
]
Improved-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index d9da474fb0..57d6e2b98d 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -106,7 +106,8 @@ the use of non-ASCII filenames. pre-merge-commit ~~~~~~~~~~~~~~~~ -This hook is invoked by linkgit:git-merge[1]. It takes no parameters, and is +This hook is invoked by linkgit:git-merge[1], and can be bypassed +with the `--no-verify` option. It takes no parameters, and is invoked after the merge has been carried out successfully and before obtaining the proposed commit log message to make a commit. Exiting with a non-zero status from this script |