diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-18 11:50:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-18 11:50:08 -0700 |
| commit | f76bd8c6b132bdcefd547cb99cb832f433fee544 (patch) | |
| tree | 7656d005aed1e24001a924ed48b02f90dc96262c /diff.c | |
| parent | a2e524ecf396722020e85b39d7b5e83d7c95ec24 (diff) | |
| parent | bc40ce4de612942e9a6a755f7432806ee095bd82 (diff) | |
Merge branch 'js/pre-merge-commit-hook'
A new "pre-merge-commit" hook has been introduced.
* js/pre-merge-commit-hook:
merge: --no-verify to bypass pre-merge-commit hook
git-merge: honor pre-merge-commit hook
merge: do no-verify like commit
t7503: verify proper hook execution
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions