summaryrefslogtreecommitdiff
path: root/worktree.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-18 11:50:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-18 11:50:08 -0700
commitf76bd8c6b132bdcefd547cb99cb832f433fee544 (patch)
tree7656d005aed1e24001a924ed48b02f90dc96262c /worktree.h
parentMerge branch 'cb/curl-use-xmalloc' (diff)
parentmerge: --no-verify to bypass pre-merge-commit hook (diff)
downloadtgif-f76bd8c6b132bdcefd547cb99cb832f433fee544.tar.xz
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 'worktree.h')
0 files changed, 0 insertions, 0 deletions