summaryrefslogtreecommitdiff
path: root/templates/hooks--pre-merge-commit.sample
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-25 14:19:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-25 14:19:20 -0800
commitb7bb322cba9f45f6b0294b7d1ef272013902b169 (patch)
treeef712b149cf1b49d95f2497dbd0619f2c68d1897 /templates/hooks--pre-merge-commit.sample
parentMerge branch 'tb/pack-revindex-api' (diff)
parentt4203: make blame output massaging more robust (diff)
downloadtgif-b7bb322cba9f45f6b0294b7d1ef272013902b169.tar.xz
Merge branch 'ab/mailmap-fixup'
Follow-up fixes and improvements to ab/mailmap topic. * ab/mailmap-fixup: t4203: make blame output massaging more robust mailmap doc: use correct environment variable 'GIT_WORK_TREE' t4203: stop losing return codes of git commands test-lib-functions.sh: fix usage for test_commit()
Diffstat (limited to 'templates/hooks--pre-merge-commit.sample')
0 files changed, 0 insertions, 0 deletions