summaryrefslogtreecommitdiff
path: root/t/t9154/svn.dump
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2019-08-07 11:57:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-07 12:37:33 -0700
commitbc40ce4de612942e9a6a755f7432806ee095bd82 (patch)
tree5eeb2e755519e30ef7f8b16ad8e72e501fc5f64b /t/t9154/svn.dump
parentgit-merge: honor pre-merge-commit hook (diff)
downloadtgif-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 't/t9154/svn.dump')
0 files changed, 0 insertions, 0 deletions