diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2019-08-07 11:57:08 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-07 12:37:33 -0700 |
| commit | bc40ce4de612942e9a6a755f7432806ee095bd82 (patch) | |
| tree | 5eeb2e755519e30ef7f8b16ad8e72e501fc5f64b /builtin/write-tree.c | |
| parent | git-merge: honor pre-merge-commit hook (diff) | |
| download | tgif-bc40ce4de612942e9a6a755f7432806ee095bd82.tar.xz | |
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 'builtin/write-tree.c')
0 files changed, 0 insertions, 0 deletions